diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dc97f7e456a9..54e74fb33115 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -163,6 +163,7 @@
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+  schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   shell = "Shell Turner <cam.turn@gmail.com>";
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
new file mode 100755
index 000000000000..58231a356369
--- /dev/null
+++ b/lib/tests/modules.sh
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# This script is used to test that the module system is working as expected.
+# By default it test the version of nixpkgs which is defined in the NIX_PATH.
+
+cd ./modules
+
+pass=0
+fail=0
+
+evalConfig() {
+    local attr=$1
+    shift;
+    local script="import ./default.nix { modules = [ $@ ];}"
+    nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only
+}
+
+reportFailure() {
+    local attr=$1
+    shift;
+    local script="import ./default.nix { modules = [ $@ ];}"
+    echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only"
+    evalConfig "$attr" "$@"
+    fail=$((fail + 1))
+}
+
+checkConfigOutput() {
+    local outputContains=$1
+    shift;
+    if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
+        pass=$((pass + 1))
+        return 0;
+    else
+        echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
+        reportFailure "$@"
+        return 1
+    fi
+}
+
+checkConfigError() {
+    local errorContains=$1
+    local err=""
+    shift;
+    if err==$(evalConfig "$@" 2>&1 >/dev/null); then
+        echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
+        reportFailure "$@"
+        return 1
+    else
+        if echo "$err" | grep --silent "$errorContains" ; then
+            pass=$((pass + 1))
+            return 0;
+        else
+            echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
+            reportFailure "$@"
+            return 1
+        fi
+    fi
+}
+
+checkConfigOutput "false" config.enable ./declare-enable.nix
+checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix
+set -- config.enable ./declare-enable.nix ./define-enable.nix
+checkConfigOutput "true" "$@"
+checkConfigOutput "false" "$@" ./define-force-enable.nix
+checkConfigOutput "false" "$@" ./define-enable-force.nix
+
+checkConfigError 'attribute .*foo.* .* not found' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix
+checkConfigOutput 'false' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix
+set -- config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo-enable.nix
+checkConfigOutput 'true' "$@"
+checkConfigOutput 'false' "$@" ./define-force-loaOfSub-foo-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-force-foo-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-force-enable.nix
+checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-enable-force.nix
+
+checkConfigError 'attribute .*bar.* .* not found' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix
+checkConfigOutput 'false' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar.nix
+set -- config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar-enable.nix
+checkConfigOutput 'true' "$@"
+checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-loaOfSub-foo-enable.nix
+checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-loaOfSub-force-foo-enable.nix
+checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-force-enable.nix
+checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-enable-force.nix
+
+cat <<EOF
+====== module tests ======
+$pass Pass
+$fail Fail
+EOF
+
+if test $fail -ne 0; then
+    exit 1
+fi
+exit 0
diff --git a/lib/tests/modules/declare-enable.nix b/lib/tests/modules/declare-enable.nix
new file mode 100644
index 000000000000..ebee243c7568
--- /dev/null
+++ b/lib/tests/modules/declare-enable.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  options = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+}
diff --git a/lib/tests/modules/declare-loaOfSub-any-enable.nix b/lib/tests/modules/declare-loaOfSub-any-enable.nix
new file mode 100644
index 000000000000..71dad1c91359
--- /dev/null
+++ b/lib/tests/modules/declare-loaOfSub-any-enable.nix
@@ -0,0 +1,29 @@
+{ lib, ... }:
+
+let
+  submod = { ... }: {
+    options = {
+      enable = lib.mkOption {
+        default = false;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          Some descriptive text
+        '';
+      };
+    };
+  };
+in
+
+{
+  options = {
+    loaOfSub = lib.mkOption {
+      default = {};
+      example = {};
+      type = lib.types.loaOf (lib.types.submodule [ submod ]);
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+}
diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix
new file mode 100644
index 000000000000..5df7d9751eab
--- /dev/null
+++ b/lib/tests/modules/default.nix
@@ -0,0 +1,7 @@
+{ lib ? import <nixpkgs/lib>, modules ? [] }:
+
+{
+  inherit (lib.evalModules {
+    inherit modules;
+  }) config options;
+}
diff --git a/lib/tests/modules/define-enable-force.nix b/lib/tests/modules/define-enable-force.nix
new file mode 100644
index 000000000000..f4990a328631
--- /dev/null
+++ b/lib/tests/modules/define-enable-force.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  enable = lib.mkForce false;
+}
diff --git a/lib/tests/modules/define-enable.nix b/lib/tests/modules/define-enable.nix
new file mode 100644
index 000000000000..7dc26010ae59
--- /dev/null
+++ b/lib/tests/modules/define-enable.nix
@@ -0,0 +1,3 @@
+{
+  enable = true;
+}
diff --git a/lib/tests/modules/define-force-enable.nix b/lib/tests/modules/define-force-enable.nix
new file mode 100644
index 000000000000..978caa2a8c07
--- /dev/null
+++ b/lib/tests/modules/define-force-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+lib.mkForce {
+  enable = false;
+}
diff --git a/lib/tests/modules/define-force-loaOfSub-foo-enable.nix b/lib/tests/modules/define-force-loaOfSub-foo-enable.nix
new file mode 100644
index 000000000000..bfd8e084b590
--- /dev/null
+++ b/lib/tests/modules/define-force-loaOfSub-foo-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+lib.mkForce {
+  loaOfSub.foo.enable = false;
+}
diff --git a/lib/tests/modules/define-loaOfSub-bar-enable.nix b/lib/tests/modules/define-loaOfSub-bar-enable.nix
new file mode 100644
index 000000000000..422bb0a600bf
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-bar-enable.nix
@@ -0,0 +1,3 @@
+{
+  loaOfSub.bar.enable = true;
+}
diff --git a/lib/tests/modules/define-loaOfSub-bar.nix b/lib/tests/modules/define-loaOfSub-bar.nix
new file mode 100644
index 000000000000..c24315e09b6e
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-bar.nix
@@ -0,0 +1,3 @@
+{
+  loaOfSub.bar = {};
+}
diff --git a/lib/tests/modules/define-loaOfSub-foo-enable-force.nix b/lib/tests/modules/define-loaOfSub-foo-enable-force.nix
new file mode 100644
index 000000000000..c1d7b198be54
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-foo-enable-force.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  loaOfSub.foo.enable = lib.mkForce false;
+}
diff --git a/lib/tests/modules/define-loaOfSub-foo-enable.nix b/lib/tests/modules/define-loaOfSub-foo-enable.nix
new file mode 100644
index 000000000000..822425c71bb9
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-foo-enable.nix
@@ -0,0 +1,3 @@
+{
+  loaOfSub.foo.enable = true;
+}
diff --git a/lib/tests/modules/define-loaOfSub-foo-force-enable.nix b/lib/tests/modules/define-loaOfSub-foo-force-enable.nix
new file mode 100644
index 000000000000..dce0ef547b31
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-foo-force-enable.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  loaOfSub.foo = lib.mkForce {
+    enable = false;
+  };
+}
diff --git a/lib/tests/modules/define-loaOfSub-foo.nix b/lib/tests/modules/define-loaOfSub-foo.nix
new file mode 100644
index 000000000000..e9b2e631f2ec
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-foo.nix
@@ -0,0 +1,3 @@
+{
+  loaOfSub.foo = {};
+}
diff --git a/lib/tests/modules/define-loaOfSub-force-foo-enable.nix b/lib/tests/modules/define-loaOfSub-force-foo-enable.nix
new file mode 100644
index 000000000000..df5722274ee5
--- /dev/null
+++ b/lib/tests/modules/define-loaOfSub-force-foo-enable.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  loaOfSub = lib.mkForce {
+    foo.enable = false;
+  };
+}
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
new file mode 100644
index 000000000000..e7fb52f67665
--- /dev/null
+++ b/lib/tests/release.nix
@@ -0,0 +1,31 @@
+{ nixpkgs }:
+
+with import ./../.. { };
+with lib;
+
+stdenv.mkDerivation {
+  name = "nixpkgs-lib-tests";
+  buildInputs = [ nix ];
+  NIX_PATH="nixpkgs=${nixpkgs}";
+
+  buildCommand = ''
+    datadir="${nix}/share"
+    export TEST_ROOT=$(pwd)/test-tmp
+    export NIX_STORE_DIR=$TEST_ROOT/store
+    export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
+    export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
+    export NIX_STATE_DIR=$TEST_ROOT/var/nix
+    export NIX_DB_DIR=$TEST_ROOT/db
+    export NIX_CONF_DIR=$TEST_ROOT/etc
+    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
+    export NIX_BUILD_HOOK=
+    export PAGER=cat
+    cacheDir=$TEST_ROOT/binary-cache
+    nix-store --init
+
+    cd ${nixpkgs}/lib/tests
+    ./modules.sh
+
+    touch $out
+  '';
+}
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index ceac40b7a1f6..b7e47b8729f3 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -10,7 +10,7 @@
 use NetworkManager. You can enable NetworkManager by setting:
 
 <programlisting>
-services.networkmanager.enable = true;
+networking.networkmanager.enable = true;
 </programlisting>
 
 some desktop managers (e.g., GNOME) enable NetworkManager
@@ -19,8 +19,8 @@ automatically for you.</para>
 <para>All users that should have permission to change network settings
 must belong to the <code>networkmanager</code> group.</para>
 
-<note><para><code>services.networkmanager</code> and
-<code>services.wireless</code> can not be enabled at the same time:
+<note><para><code>networking.networkmanager</code> and
+<code>networking.wireless</code> can not be enabled at the same time:
 you can still connect to the wireless networks using
 NetworkManager.</para></note>
 
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 549e731f3b08..a39c2895bf84 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -8,6 +8,7 @@ let
 
   inherit (config.services.avahi) nssmdns;
   inherit (config.services.samba) nsswins;
+  ldap = config.users.ldap.enable;
 
 in
 
@@ -40,9 +41,9 @@ in
     # should define an option used by this module.
     environment.etc."nsswitch.conf".text =
       ''
-        passwd:    files ldap
-        group:     files ldap
-        shadow:    files ldap
+        passwd:    files ${optionalString ldap "ldap"}
+        group:     files ${optionalString ldap "ldap"}
+        shadow:    files ${optionalString ldap "ldap"}
         hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines
         networks:  files dns
         ethers:    files
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index d35ecb754bdb..de73de91629b 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -174,12 +174,12 @@ foreach my $u (@{$spec->{users}}) {
         } elsif (defined $u->{initialHashedPassword}) {
             $u->{hashedPassword} = $u->{initialHashedPassword};
         }
+    }
 
-        # Create a home directory.
-        if ($u->{createHome}) {
-            make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
-            chown $u->{uid}, $u->{gid}, $u->{home};
-        }
+    # Create a home directory.
+    if ($u->{createHome} && ! -e $u->{home}) {
+        make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
+        chown $u->{uid}, $u->{gid}, $u->{home};
     }
 
     if (defined $u->{passwordFile}) {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 796740ea636a..bd9b897158dc 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -4,8 +4,19 @@
 
 with lib;
 
-let cfg  = config.programs.ssh;
-    cfgd = config.services.openssh;
+let
+
+  cfg  = config.programs.ssh;
+  cfgd = config.services.openssh;
+
+  askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+
+  askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
+    ''
+      #! ${pkgs.stdenv.shell} -e
+      export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
+      exec ${askPassword}
+    '';
 
 in
 {
@@ -117,6 +128,11 @@ in
             Restart = "on-failure";
             SuccessExitStatus = "0 2";
           };
+        # Allow ssh-agent to ask for confirmation. This requires the
+        # unit to know about the user's $DISPLAY (via ‘systemctl
+        # import-environment’).
+        environment.SSH_ASKPASS = optionalString config.services.xserver.enable askPasswordWrapper;
+        environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS
       };
 
     environment.extraInit = optionalString cfg.startAgent
@@ -126,5 +142,10 @@ in
         fi
       '';
 
+    environment.interactiveShellInit = optionalString config.services.xserver.enable
+      ''
+        export SSH_ASKPASS=${askPassword}
+      '';
+
   };
 }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index dcb2d5494754..aa8d9224e35a 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -215,7 +215,7 @@ let
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString cfg.oathAuth
-              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath
+              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.krb5.enable ''
@@ -252,7 +252,7 @@ let
           ${optionalString cfg.otpwAuth
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString cfg.oathAuth
-              "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath
+              "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
           ${optionalString cfg.startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString cfg.forwardXAuth
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 02e44ad88704..14ffdad9217d 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -120,6 +120,7 @@ in
         };
 
         preStart = ''
+          rm ${cfg.dbpath}/mongod.lock || true
           if ! test -e ${cfg.dbpath}; then
               install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
           fi
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index fbb211911f1c..7ddabf73106e 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -82,7 +82,7 @@ in
 
     systemd.services.dnsmasq = {
         description = "dnsmasq daemon";
-        after = [ "network.target" "systemd-resolved.conf" ];
+        after = [ "network.target" "systemd-resolved.service" ];
         wantedBy = [ "multi-user.target" ];
         path = [ dnsmasq ];
         preStart = ''
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index c0ad9e17c413..a7617d02c185 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -195,12 +195,14 @@ in
         default =
           [ { path = "/etc/ssh/ssh_host_dsa_key";
               type = "dsa";
-              bits = 1024;
             }
             { path = "/etc/ssh/ssh_host_ecdsa_key";
               type = "ecdsa";
               bits = 521;
             }
+            { path = "/etc/ssh/ssh_host_ed25519_key";
+              type = "ed25519";
+            }
           ];
         description = ''
           NixOS can automatically generate SSH host keys.  This option
@@ -323,7 +325,7 @@ in
 
                 ${flip concatMapStrings cfg.hostKeys (k: ''
                   if ! [ -f "${k.path}" ]; then
-                      ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N ""
+                      ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N ""
                   fi
                 '')}
               '';
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 601971d27b69..ea45dabd1257 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -89,6 +89,10 @@ let
         ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
+      # Tell systemd about our $DISPLAY. This is needed by the
+      # ssh-agent unit.
+      ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY
+
       # Load X defaults.
       ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
       if test -e ~/.Xresources; then
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 70158fc7252b..8223c5a4941e 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -35,7 +35,10 @@ in
     assertions = [ {
       assertion = cfg.defaultGatewayWindowSize == null;
       message = "networking.defaultGatewayWindowSize is not supported by networkd.";
-    } ];
+    } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
+      assertion = !rstp;
+      message = "networking.bridges.${n}.rstp is not supported by networkd.";
+    });
 
     systemd.services.dhcpcd.enable = mkDefault false;
 
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
new file mode 100644
index 000000000000..8fdc198f45c4
--- /dev/null
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }:
+stdenv.mkDerivation rec {
+  name = "edbrowse-3.5.2";
+  buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24"
+    '';
+  installPhase = "installBin src/edbrowse";
+  src = fetchurl {
+    url = "http://the-brannons.com/edbrowse/${name}.zip";
+    sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714";
+  };
+  meta = {
+    description = "Edbrowse, a Command Line Editor Browser";
+    longDescription = ''
+      Edbrowse is a combination editor, browser, and mail client that is 100% text based.
+      The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
+      This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else.
+      A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever.
+      edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
+      '';
+    license = stdenv.lib.licenses.gpl1Plus;
+    homepage = http://the-brannons.com/edbrowse/;
+    maintainers = [ stdenv.lib.maintainers.schmitthenner ];
+  };
+}
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index d5b8314cea5d..429de65b568c 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
-, coreutils, gnugrep, which, git, python, unzip
+, coreutils, gnugrep, which, git, python, unzip, androidsdk
 }:
 
 assert stdenv.isLinux;
@@ -54,25 +54,26 @@ let
     '';
 
     installPhase = ''
-      mkdir -vp $out/{bin,$name,share/pixmaps,libexec/${name}}
-      cp -va . $out/$name
+      mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
+      cp -a . $out/$name
       ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
       mv bin/fsnotifier* $out/libexec/${name}/.
 
       jdk=${jdk.home}
+      item=${desktopItem}
 
       makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
         --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
         --prefix JDK_HOME : "$jdk" \
         --prefix ${hiName}_JDK : "$jdk"
 
-      cp -a "${desktopItem}"/* "$out"
+      ln -s "$item/share/applications" $out/share
     '';
 
   };
 
   buildAndroidStudio = { name, version, build, src, license, description }:
-    (mkIdeaProduct rec {
+    let drv = (mkIdeaProduct rec {
       inherit name version build src;
       product = "Studio";
       meta = with stdenv.lib; {
@@ -88,6 +89,13 @@ let
         maintainers = with maintainers; [ edwtjo ];
       };
     });
+    in stdenv.lib.overrideDerivation drv (x : {
+      buildInputs = x.buildInputs ++ [ makeWrapper ];
+      installPhase = x.installPhase +  ''
+        wrapProgram "$out/bin/android-studio" \
+          --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/"
+      '';
+    });
 
   buildClion = { name, version, build, src, license, description }:
     (mkIdeaProduct rec {
@@ -185,14 +193,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.1.0b2";
-    build = "135.1711524";
+    version = "1.1.0";
+    build = "135.1740770";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw";
+      sha256 = "1r2hrld3yfaxq3mw2xmzhvrrhc7w5xlv3d18rv758hy9n40c2nr1";
     };
   };
 
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 0950817c7888..fa5ae99f4fb5 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "cherrytree-0.35.6";
+  name = "cherrytree-0.35.7";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "1nfrnnwaxb07jf5c3id8zimr3q3rbhvzjlmpb99d41d7hqrd2bxj";
+    sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 ];
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 0c084f9d018c..3bf739bbec5e 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ stdenv, lib, fetchgit, makeWrapper
 , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
 , keybinder3, clutter_gtk, libnotify
 , libxkbcommon, xlibs, udev
 , bashInteractive
 }:
 
-let rev = "5ccde4e8f2c02a398f9172e07c25262ecf954626";
-in stdenv.mkDerivation {
-  name = "finalterm-git-${builtins.substring 0 8 rev}";
+stdenv.mkDerivation {
+  name = "finalterm-git-2014-11-15";
 
-  src = fetchFromGitHub {
-    owner = "p-e-w";
-    repo = "finalterm";
-    inherit rev;
-    sha256 = "1gw6nc19whfjd4xj0lc0fmjypn8d7nasif79671859ymnfizyq4f";
+  src = fetchgit {
+    url = "https://github.com/p-e-w/finalterm.git";
+    rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b";
+    sha256 = "c3ec9b36692b66a3aaa3125b2947c83beda4705b6d6f4a10b9bde9d8db8367c5";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
new file mode 100644
index 000000000000..de1abff9c16a
--- /dev/null
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "xkblayout-state";
+  version = "1b";
+
+  src = fetchurl {
+    url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz";
+    sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx";
+  };
+
+  buildInputs = [ qt4 ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp xkblayout-state $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small command-line program to get/set the current XKB keyboard layout";
+    homepage = https://github.com/nonpop/xkblayout-state;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index ab3a4575212e..1b439daa853e 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1prs3r6xcxq31xfdp3w2wdi3d7r6lw5r4d4zay2cwphmp4kpg3qg"
-    else if stdenv.system == "i686-linux" then "09rn95qvkdwlzqq11hqfq4i5cam6dip7ww1wd5dpyirzn8yw7cfh"
+  sha256 = if stdenv.system == "x86_64-linux" then "1b9f6qxpvyrzf23l71hw42qyg4i27by3hs91sm34drm24z7m7fpd"
+    else if stdenv.system == "i686-linux" then "0caqwaxd6i8cap35kpzkwy5dknk7iaxf5fbfjy46cbwylgcpsc2x"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "1.4.106";
+  version = "1.4.110";
 
   src  = fetchurl {
     url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 0018f00a3662..23726f5c3d18 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation {
       ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"
 
       for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
+        firefox firefox-bin plugin-container \
         updater crashreporter webapprt-stub
       do
         patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
       done
 
       for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
+        firefox firefox-bin plugin-container \
         updater crashreporter webapprt-stub libxul.so
       do
         patchelf --set-rpath "$libPath" \
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index f99ff763cb89..16c38ed1c56f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,183 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "35.0.1";
+  version = "36.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "124492ee256fc578cff9e7774f679a0dc3f75a27"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "f3503b3d8889d8f097219cee2fb793f06bdff7ed"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "52dd493830ec7d3d0c1dd9d5d91449944f3ed0cb"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "bb88cfe49158d1b650bff932ccd65f750681df9f"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "883f34da9eaf2975d46f07bf4ffb7e991231f9a8"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "1757dbb135225b5b1958084fb3e8b0050451ac1f"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "839887065496742f53c7868bed5f172e0727b236"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a0f4a097083449e81278a9accb23cb6e76cf39e1"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "7395f49cdb471d67eff6aad56fd896b2b60ca9ea"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "219ac273c48ec5018a1c62eb5c8ff1588bad466a"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "5228be973800169254e75016b5c1c11477b40fbf"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "7065cbb3fea059bf880217068704367168458c78"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "0c8cc063cd4661660b352d370281a477eb444697"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "1fdb7b783a9a90767c5c63a149f3ada590e3f81f"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "29532d5c3f3a8c9db4cc83dffea8328609eef286"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "cde75662d5b868117c76b3b4418292e6d536038c"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "272bd811c7b921ab80231c8994e04cb79aa7c868"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "01bfcb17b1524d3c5571283fa8abaa409250a640"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "40d2d3a9da8033e60e2bcd8faa0aa94a1f8acffb"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "a96f420650deb7d65c449861a05ae35154247009"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e2db4777b68113ec300e00e1235d7aa6eaebb9a2"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "bf886b2983bd3f0528bfdba036d978230fb0f9f6"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "6b74d9b0a1b6114810a98d615b32115b39be0eed"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "9c5c21f0b7d5f6677065cc57faccc4d6fb280a39"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "72acb7bd98f689eb8cef254c72da4fd0bda3274c"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "015adba9f964ad8cfbaf5081416a380d0abbd167"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "3e1f61aaa19328f7cc729fc011dc216ef33054cf"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "bb489274879dcdfeb86c778a7aef5d971e8c1111"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "729901a823944d4f92571f3f8f07d936f6e0635c"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3066eec76de4c79699893afe497d12540ed49d80"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "0206ebc636ab4f3264281ddbef21f3d99c72c92f"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "48d7577d158daf8d4edf988c3efbb40944f7d607"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "39e692a7227349a53cde95a18024fd8f9c47a49d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "0f85723f4a602c5348e1f910384cb05d4b0d37b8"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "b5150224a5115403cc12bdc583d89151d29aab23"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "890bd378d14fcfcfee327405323fb18d688f9575"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "6f6b9af4610b85c73e523e8149849a21e60a078c"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "3d45d05927b18e7a3d95edad282bdb4efb41509f"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "c1cca4d312329eef5023b16d08e7bfc40c3c06c8"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "2ca19c2beb794108f7138f07d91edefa5911e6da"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "034f5d2c82e519b53afa490850ab305134c58d7d"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "66d8a48abb3fdefa2498e8bf56b5b1fffe8f61ea"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "175647bcb6c4a879887e7b5c1d1260f11980f25c"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "7bab378891240db491078084ee0904dcd8c405cf"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "71dedd0008bc788631c83ec68a2975baf7dc4ecb"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0b620b139fa436816f2f48971bdc67a829effee"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "61f93f3ed51175afec69ab1f1ced1ad89e488cec"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "ee894635e4d584635a585702cfc364f318a8b7bc"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "ffe30c5da202fe9fa068423e8b2155d38902239c"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bc7e04f5264f5c6542705e29adcf0e873fe22396"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "c3f4fe2dcd009ddad4ed4c4c25dd8fde364dbb6f"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "271e4f84495a75bdf539f5d3383a510832ead8b1"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7d2c74454e59220f15158fb13cf896d667b70f43"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "0e02895eeeb66cb8aaea96b566745dcb83517fde"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "753c0788ab58ab390546116dbd708cba0e5ef908"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "64be3770cf6ffa3df353cac4493b07e95dae5a1d"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "66b7184dfb39182fc3533e0601aac3d54005e7fd"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "f5f9b0ae73a57d61d32ac143aac09286bf75c8a7"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "92a25a4fdee339eb327acd0713ecb3da0975ae6f"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "b58bb2d5b2257c1f75009ee3c53289b55dbe1f64"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "a39e96d6c082035be2dd826dfb990ba76bb85c57"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "e73e5bb35aede5957437cc0f789d035cc4cba639"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "e0c69dcae50a31788695beb9562f77bb6a101a61"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bdd0884b3c0feabf9041ce10c7c379204b64cdf4"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "19bf8ea81a02d32253db23c4c2432b4fb5437234"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "e3c86049567412e74634bda3fa419c013b9c1e1b"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "83ed1c125a7747768980c739fe4b76b47274f47b"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "4666f31d0983b7bec54c98bcfa02e85e3097d024"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a6fe37320351b18d0ee9257522d34213c598aa3"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "eb7418db94f041d209d89ae33f20b0fa482d5c84"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "525665b9310b099c93323dccef4e434627eb517b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "88aa7e3b35f80474f3235f6aa087b4348f372b9e"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "78b59e7934f2014b8dc99fba210a691ba0ace966"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "8b0c11b78b6cd6363a8fb0dc51f88e306b321a34"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "f1d0bc9ccfa9ade46b1caabd511f8a6359895482"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "9b2bcf8aa3a4dabd29b69ad3a102aa6ee999bebc"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "2d3fa5a189283b4f5ddc88c5526380d1bbc9ff73"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "e8d8803075e2b3bcd44470f2563fdb7d2855021e"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "1c7695c021832d7daab3838d333a02ad141aa22d"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "1a7fec7fbbeebdf3368ad7474ea593ab6d0d0131"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "14ffc0706fe6f00d2778a3567dc27bdbc96b4fbb"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "77431a1b81c86b8da78b6a5728cf1d054b9b9a28"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "a0796dfbb45b796a3391e697320009ac761c082a"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "98aa2c4455caf0f35946ca2c6de7ff4214e33221"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "26933524c477fcd522b98f75e9e9339d80bdddf5"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "f365032803a41c57c75d06945104add35564afcd"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "ab4cb56cb1679159d1a7cca55f26b99c5ff1a784"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "829fb1baaaba4e3e43ad72b3e0bff78f8fd828e4"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b329665bc7643e7e49461112a96fa8ab23f7d15b"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4fea5950fddc26e002f72e7a8b4763fb8620bff1"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "d678096e976ada75bff62309e09cc5c92f4eb885"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "f80f225ce9acd6f1aa91e18d351431d6ea3ca05e"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "abc31651c3c8884be2166e5d85fd09f793a9bf15"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "4e276bb56d9cf9be18788ba1a585a29c094eec0c"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "2a3816a56615b910915207c97b093d5c81f169d5"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "4d7cec0c6fb393a0bf208135efd0b13691d319a5"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "54d9e17ee54a969da8ec68881a1165cd1d49a351"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "fbc9ded1ab4d0714094beb4215dd0c547d931983"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "1e7ac8d7b657fc76aba70c2a1fc76cad3935aa0d"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "3d7fa92e91b29546aa4232f118984c0c7c8e7066"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "88e470efb8cec8a1439a7fa02684e02c801ce5ec"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "9575cc0fa4130ca5856f20a058df7850e901f531"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "ede8a5f91dd08eb8901c565462a23ec49b647b87"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "9af854901746299ee8eb542f82d8d2b302312ba7"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "55b7af838ff5c46f2c0b9593e6a621007f6207f1"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "b41e5e2ac9b2d20a2d55fcbcc34f03ac110880e3"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "fb64abf1c4b9e1cd26bafe5d0f8d8d88c59e7788"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "b2d211490dba526c2be6a71be1767ca273635229"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "e052e41cb5426e15fbb9a95ac957eb24cda7605c"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "4e37df4924c10a07dc0dc4a87e44e155dbdfa095"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "694554dd94105ba299365adacd31ccc683f33814"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "116e576e4a0dee81c98a83a15a3fbd8d2e26361c"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "1d4cdcc4809ab9dfd6368ba9fa932f658b6e05f5"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef6e2e49df835f2f06de46cfbaac0aa7d3a0bab0"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "f8dd4ab0936e7a1e9511290201ee7b547d3dfa96"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "2dd8f9499e9c5dee258905466ec1c9784c93e392"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "c7ac2d940151db540edf268d5649b7958157deb0"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "6b624ded66ca9f7a4b81e52b3366006830616afd"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "83a2eebb9ea12fc58fdce64d2e6cca6a642ed6c4"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "f9aeb1b9bfe90cb875967a518cc430ed78c76d34"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "31e58e62373f5482059cbdb56228e93287071c2a"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9caa154f5f357eeff788b6069a6417f2cc6fa30d"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "96a02745a2eceb0481e72dc195754500cac1cae2"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b141df4d511d380e955a3f4c49ce6f87e687a17e"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "1cd11a61afbc4d60878d089545b74c5c7d4a24f1"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "a365160b0a1490dbf3234a2d3e05d338627dd0f2"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "cf4f384f73215fc3337775ca8933d687f19c3e51"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "b6e20b7ca13b95a17bfcab4bafa672fe814853dd"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "f6b4d3bfb92aa480c6bcec1ecf1e68c90201015e"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "df4538d39cce9cd7817c9b59b6aec949484fc84a"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fdc2799e53e9290c1e68975ed1a906c4cf6e0252"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c69c7a16743aa76ccbe8a89f33c5390a127f92bd"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "a7f253212f9aed52c95f260da1cb4683617b839b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "792d883f300d2a9ccddd64fe88c9837926431c14"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1221b7d1b7e997964b6e6e3de1364204e81682c6"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c65f1d29b35abc7070de124422f67e2e5c48a582"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8ea761c8459bfd664cea9afddb5a716d633dd407"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77d799feca448cb187931d8fdf80859f4a1214ad"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "ee1901e059abc81b82ccd018f3cf05b2471fd7da"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "2e0615de00051dec1cb2fb4c5cb866fbd2f349b7"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "a75e667217ee3a5ed1897bc01e07e52efb96d281"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a76447946a8273cd8ec70cbbef013563f137688f"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "93e9548ae9f3fcfea35ef08ede8da2af98d693d3"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af0613ba8b3ce75001c2a91c977fab728a8ae36c"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "aba611c1658d64151ad57ca321fc0050773db894"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "7a047794eec69dbf15f60dfbda1b8611435d2fc4"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "c6225541a63f18923a241488263987c662847548"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "0ca98adb699801f93fe7cd76b1c386b18c1f67a6"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "679f7d72f705dcffdfc36e5b89e3db3b56f76b74"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "36ee186bc3b7c0868f344c02fe44a98585188e9d"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "f96fe078e660c69b46ae8d3e0ce3189e4725a9fd"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "700f875dbd7b16ffad92e6ce9e39de41554384e7"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "60af78da783fd8183371f7e62ea9e58b0306fa24"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "55f2172292ae2ffec2244396a3f1d8399ce4233b"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "becede293c5e225c8212e91bd97dda070ee8e677"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "0a122107f6161757744deb21bf7afd1284aa9bcb"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0f95be8a5510fe89475346c0b3ee91bee967b4e9"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6185a8d66a73082146fc728e1ee9108a72eb29b6"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "6a4bb348caafce8d406bb431b69161ea21290241"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5f1c0f08d2ee49d6484f84bdd721f2e26cf09fb1"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "43b4166646f593e82bd5ffe3609960f3bdf8abd2"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "8f567accf4db46a669ac0da25ff48a843fd8c940"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "ec19b178cc82802edb2f2060c47663422d3cef2a"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "667db54905a5e539c11752f954e93ac991f958bd"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "bddfc685191b9cd686ba8911e790e4c103d2a652"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ea92a05be86355c31fc3cbde7ce1ab3946d9239c"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "b0a25b1047e3d2a34f28750db03e9cf7247d46b3"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "2753baa3b5c486723c8ace486203ff6c7e9c1ac9"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "0d0b7a57282560bbb5e26e23f65844f0c5eac888"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "f6a44d48325d3da23cd618c78d70fd8d9201a7a4"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "44700f87ec176ffed749ae31f7dd04664a8a050b"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "24c4355e2b12886232cff0c5fe791824050d38a6"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "24f06bbdcfd94f3d0168c93f83c13fd5bbb59c5b"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ea584b5aaa279694c4550b83ddd61de586f62517"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c257cbd9ed02f699384ffb8ece286c3b8e94ea8f"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "87fff9bf03bd3208bd71d92527dbddfb0dd12a6f"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "089dff0a3623feee0379832ccde522f86fdc448c"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "ac2ed6ffa8d27ecd978950220288e14c500aefbe"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "e8d44633f01dffe46e8b1278ddb274eefee556a4"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "f7d364cf00f0058e55e193cc907fd4996f96043b"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "85c2b67d8d963d9421559807b8dfb36baa976029"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "182b4feeb5c24921c4074ee560e1d2619bc28a25"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "a18be34551fa3352a30cc927746806ea3d0401ed"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "be45f1db3b2f6128a35313aac0738eb6f3ed53f2"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "44e5cf86e6318d2c25fa4f9dd9c0bfaf273f6749"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "da9d1e7e3e8ed4dbc935ece517e55ae456930e52"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "c23f59e3452f7393554491a930626495e9855855"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "fd2f6ce7d12a7c53fe9d9c11336b88c405859206"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "5b92332c155a95b8638506ac1c3dd78e19e277e4"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "5d148d13421bacb3d430e317a41253a0999ed55f"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "36cfbc4b84a374535cde94643bbdacea3e141c60"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "0c0ea9dec82efd7baf2c2b382c0ab67d22f7b252"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "80e0068890e6b422f392924f4e317c6d2058695e"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b4f3fa93b7d793560627ec4d51c138d013dd6c00"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "14f5d14a135fc929ee670078e50567b5461ece8a"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "95f561f92166d9db64ba5e36edaa14d7b4f989a3"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "07b00a5d4b83d8d0e451ba08325fb44c784453f6"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "a96e0bafbf811c5bd57fb3e8164e38365386e460"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "ee51d5b01c4489e5802c130748ee16b0a803dcb9"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "0cff437fe8c29705ec9d800d95329309eed540f4"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "0d7aef80272ca1de27560b7fe4f8ec892d386b6d"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "b62a905e9e992e3765cf196a18d50f533e2dd69f"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "82316407a9745d4dc56d961f5f2282c702950fe2"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "69ae06e06a90a28eb66db4d0df2fdbb5397abc24"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "c55e80b3d74f6dd494fe1c327053f59bef1c626a"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "932f6a15f1445d180df01195c19677cbe63fd18f"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "abe63dfde0487c77fa9b3b9c77fcffe0f977b25b"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "89eeb72232affbd54eff30f4c9844f802c0cf243"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "57232745fa920525721ec6e9b3c3177862b5e096"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "2ba7156b5728f17ab1e55b27ee771722a9171cf1"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "17fd4dd5e4b2ea39ed20a6d890ea5927532abd38"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "58c72ef01098523392f63209057373b9e793ebb8"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "a3296dd541362c4ca3ce8734faa33512a0fff4fc"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "c5c7bf61d4923ec9937afa6d261c7f0af64e468f"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "be04c1f884f3f0d68fa5c421eb2c8b850bef2a44"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "33ffdffb657a379f2bdb3b39bacc60d59ae9b945"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "16e2c1cda685b132b0d9378fd5ac22b0e07da320"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "89e552187c98fccc6b2270080c530bf7edf3471f"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "42be4a279ef164a43908a0896cacec6a96b2c23e"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "2a9aab1149b2bf59c2b687cb80a6fa550aa263be"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "92f42855948bd262266f6239a7f989848703a85f"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "95250cced67fb3a8eab40bc8db6d70b4efa610c9"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "6564b701a3face85aa53ab80024145b58d653ec5"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "eaa3337fbca2b182981cae1423357c537a5cc33f"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "05cebf2df8c58c03934340b9d56a1a09e0af9ffc"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d8660257e51bf94c864b27cbbfa2e3ef98ef66f8"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "827deacb3439086c263e8a3f168700e510e0158c"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b905a1b57ccacb8aec34f47126c26ce435edd2d9"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "189f5230874080d982a23725cafba889db016194"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "66f416faac68c156d0c2773a47cc2014ab51b0d1"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "1bd21f64057f4ad4e74a2f6ef7c054f0662f95bb"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0bdedcd03eae8fbde6fec2f35a7c1c0d2140f0ff"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "d4a96b30b8f084a6b2d8e58db8e7398db0738606"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "30de382a9941c4f8857938c37e491ec1a2ebfc27"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "f43ef29288e5129b8335601ea2f45ee9b94c1b82"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "cfd741f43b86a1f0a62df2c44898289cd86c2936"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "02f264a1e2c6dff8d1c1dc70f9af305fa9156c01"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "290d8a53538fe75d1e1d36407c7efa5f56569787"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "bcfd312781f308de7550a8f12609230c48c353b2"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "eddd9175de24bc429c04be01e4af6af6f7003065"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "3cf088f03c3003f1888645b06311e7f46007df83"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "a01a6fd604471cbd69c5046ec5e13f01ca63457a"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "e8e3caf2ceef2ae8a645806731bf99572244fb24"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "753a4bab9ce3016e773d4afa7ad9d14f7746cf4e"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "d0b3719b07b2c3fbe9c05ba30012331641c09d2b"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "9e8ccf90e0687aa112d48f0faeffdee58f41ea95"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a3fbc0aaf36e444ea10c4b0593ad3ec07e100147"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ed1e7b3c62dbb97bfef8b6512b8032b7bd8d2c9e"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "49fc536511bdaa096086408385ae70cace64fb0b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "67de65f4ae8accda417cd8fc9082160a4a46cc06"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "dd239f26f4d758294ce21dc1ffebe9e02584e05d"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b9d06b047de0c66485f2c7b642b6edddd7dacc3"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a191408d96e73da4ecda1faa2510dec307a3442b"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "5bf621a4fe1a625b70df63b53930a3a5ee922405"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "95b84a18316a74e8fcd7d16fd6e9c1fea6778510"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "548545c4d46c296aa9d922ee5a14312a9677822c"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5a5e53167fe9050bc9482d61d17f6808cc655407"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "36e3df183cf2b5b645cb2d89b90b640b7f3697f2"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "fa1a4482857b788c49d04f6a5c3eeada25c2ac52"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "e641cf2b562c6b391e24601d4f3ceefb7117d02a"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "b1fc4cad22c66824297aec7c82053d1f7611f108"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1c2db6cf0a14002ad4c473ab1ff1fcd7f4543ca4"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "4c5a90ed0cb4d6930a3eab0a2ec216805d680895"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c71c7e68c493bd9ecb407f32c8896b41ecfe95d5"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "01536fa2739a9dd68e713f4e4e41dac5f2b58422"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b19d7fab445ed314ca8076d0b837c0e15407649d"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "163e7a14d274a10780a18201afa7dfae27bf5967"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "d1108b006c607f470543915d8956394a1b767c27"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "5460b7445462f786f138a755615f3970fbdc7274"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "e5ec0cff0f1c88f0b2a4444ef9d71bbeb3541772"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "39cab2de100e4a1a2783659cab5c7247e230aa11"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "b21a1d214bddd8f074d0d0a06d64c4aa35580c68"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "b78dd34339c68348de753c66d6e12a78748aa261"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e4a1720278debf305c3f353bbafe35384b72bd61"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "371dc2118f8917d2fb904d07e23214728db13118"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4a4742b0f2efbb2491b501147bb1115f64b081d"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "4ad8c7a8821043a635e78f41f6da4ab6ffb334c2"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "0f4685c194054dccaac5aec9fd27f6c74ed82148"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "427b395693c8ce5d1f970f2c3a47d097785dcdea"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "15e28abebde39ebafe916523b658463087be73db"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "919862720789c005e1773b4da3427fa56c3d0528"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "aa38b625f9bab73669919c0ad36221f7c887186e"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "abc21985aa1de2fa256283f03fd3b98e147ccd3a"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "8b811ce3fe2528d33a0f00a7c3292b9cb37eb1b1"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "601dd265370ee7514a2cdf6739bfbd3d59d450d6"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c13736cb853a35f1b6583d89b9ded90302acb637"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "09910ed1364063efc07e24a78224d1fc93b2196b"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "0a6132a1080e084c9e4a691bce7e12459cec817b"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "262c75582645c2ee1c92552263aab7fe35483bc3"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "d76755153a0656c2fd17db53c40f493a0f0dcab6"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "787ec5a7ccf9b9bd116917de752e9b411e37fe5f"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "2de12f1514a47f8c0ee8a166c7c6d68d8c966824"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "807bea1339fa44c2f1d9af264539d1f550235e62"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "aeca07821afbfc0ec1763fd30da7098e27f11b19"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "d431e48ecec721b996ab6f63b99ada14ac8bbbe5"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "fb60740faf4aa2d98821c77b28be29f456707d37"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "5ef013dd820a0c945cea2f131573ffbac5693391"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "c6d211c224711eb33b8ce55605e140cc09492bd1"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6678b16af728fe90c7b58d9e5e0a3aa01ca40ca1"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "2c77fe81d3723a9be4926bbfcfb904edc928649a"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "45ee40efa93fc973e8c8d5f70f5155132f5a073b"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "29f74d404f90711974187120f8589c18125dba1e"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "162d5e2270488d40a60cb3c1e07aded76a82ba1d"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "40af304764aa36609e3969bde13ace2745bf43d8"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "721e06a231398af851bbaef046b69349b9c42e9f"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "925cb0a0bf1544b4a95abd3bf1e6bf14017b7c89"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "37f8b5ac56fcbda135b2ec5fd9ca7bfdb70d496e"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fabd53bf219b5c4e8b7f70e7ce82ab85609fcc01"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "773977cbd1146de1699b7c25b7a382bec8d0f55c"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "b3e5db98279b7425e5a1027bdfbddf8b2ba316ae"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "fea58817e88b9e1709f1661a6465ff60e4463793"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "4e05bcc1f9dc58b6fa02aaafbfab67d185d12521"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1fd067546d5d203ef201691205244ce7bd0dd96c"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "b53ae8e66d220c5a66cbd32c8762eb6a13634297"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "edc6d8dc42d7d7ee6ea6e781bcfb346ae8d7f006"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "12fd2cb3ac781490c433003b743055a67348ef04"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "87b92ed3e53f7fbed86ff1e4c6143de3c52b2f87"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "be0daa8a275ca40a8be609d24290a35a74b3ee36"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "827b057a99f1c56f4a66f1f9e8e5de2a45f68471"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "3f390efc29e49aae39d0030880a3b26cf8cd6318"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "7094d0d07dceae2e5a164d585e04799fd9a86a8b"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "7a852dc124c1f207610aaf884119ae8804caaa41"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "2439f765924307b9d2d00ce32c13384839e39d5c"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "6017d51322d4d838449d6edf969803c1281e9229"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "cfb6d7bdfd5abf6815381997d8f19710711017b9"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "e7cf289bd59a6499f018d403a5ad661fd117073b"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "e49233842e845f67d090b84caa86d9209bc5e79e"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "dfaaa438d97fa3e0839b75144ba921898114f593"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "d80a35017d041e2e4bd3a8f0925bb11d696b2ad7"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1f940683602b808962317e0da9adc82d2e81c03"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "2a82cd867d939131b1985dcfeaf0d9d2a8682edf"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "ce4e49019bf1065610b862aaaec900d509561a5c"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c3a9e5d86fe94ff9f22a3f891b604379ab1374ea"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cc397d3ce95ccb4c957f05f90ac6eec28cbc383e"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "9ed781079e459942141597671a7ba13eef65bdf1"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "fbd5dc0126e6df1ebebcc270f58d16344a46ee49"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "7c29cc8335b9d4d3d9210c77caac74d25d477cdc"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "be02910dd1abc92d3754332e56274cc977773f64"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "259edc8e888fdc32c714a45cf9599d15111f14e3"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "934b28f0936b8ac9a395c906f9ca04150c9f79db"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "be173ce377a1a3ece05fb708316d79a880708137"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "52a94b0a3fb58c256b66019d9b8c8f5ab420f3e6"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fc8e6574ef667c6a2de19cb82bec4bc47b85f907"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bace7c6ffd9f02b0d6e24046f42c64b96db1a84a"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "1df792bf6b364632a0882ac055d9fee3b537e5c2"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "f77c0bd068b1c44d20027793a826714262d38351"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "8b367c6fee817dbb12e4c54b35df8a6d09900f33"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "307dee3afe576025524dee35904e70351cf03432"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "b04a6593e912a40d20be3c90cca3c7cdcd893e92"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "6abfc8532600cdd20ce53923913d50b7eeb52ac8"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5d57176765f3be64230f36aa292992adf4a3c48c"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "df6d9a163dddacbd58591bd9572b16c7364eda2c"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "92fa3a666d858427f2a0102d85320b567c43ee40"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b11d2d33c335bd471b6762e39c646303b3345ba4"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a128e9d04a84..e9334e5b73bc 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "35.0.1"; in
+let version = "36.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "cf256ee1491ee502eb4432ade5a879104ebceede";
+    sha1 = "0939dd0258b042c7b7d4d3a3bff8e476c380885b";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index df64ea1f2d8b..ad6dac31dece 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
-, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage
-, libXfixes, libXi, libXinerama, libXrandr, libXrender
-, dbus, dbus_glib, fontconfig, gcc, patchelf
-, atk, glib, gdk_pixbuf, gtk, pango, zlib
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
+, libX11, libXmu, ncurses, popt, qt5, zlib
 }:
 
 # this package contains the daemon version of dropbox
@@ -11,10 +9,13 @@
 # note: the resulting program has to be invoced as
 # 'dropbox' because the internal python engine takes
 # uses the name of the program as starting point.
-#
-# todo: dropbox is shipped with some copies of libraries.
-# replace these libraries with the appropriate ones in
-# nixpkgs.
+
+# Dropbox ships with its own copies of some libraries.
+# Unfortunately, upstream makes changes to the source of
+# some libraries, rendering them incompatible with the
+# open-source versions. Wherever possible, we must try
+# to make the bundled libraries work, rather than replacing
+# them with our own.
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
@@ -33,14 +34,11 @@ let
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
 
-  # Libraries referenced by dropbox binary.
-  # Be aware that future versions of the dropbox binary may refer
-  # to different versions than are currently in these packages.
-  ldpath = stdenv.lib.makeSearchPath "lib" [
-      libSM libX11 libXext libXcomposite libXcursor libXdamage
-      libXfixes libXi libXinerama libXrandr libXrender
-      atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
-      gtk pango zlib
+  ldpath = stdenv.lib.makeSearchPath "lib"
+    [
+      dbus_libs gcc glib libdrm libffi libICE libSM libX11
+      libXmu ncurses popt qt5.base qt5.declarative qt5.webkit
+      zlib
     ];
 
   desktopItem = makeDesktopItem {
@@ -56,7 +54,6 @@ in stdenv.mkDerivation {
   name = "dropbox-${version}-bin";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
-    
     url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
@@ -67,15 +64,39 @@ in stdenv.mkDerivation {
     rm -f .dropbox-dist/dropboxd
   '';
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p "$out/${appdir}"
     cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
-    mkdir -p "$out/bin"
-    ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
-      "$out/${appdir}/dropbox"
-    
+    rm "$out/${appdir}/libdrm.so.2"
+    rm "$out/${appdir}/libffi.so.6"
+    rm "$out/${appdir}/libicudata.so.42"
+    rm "$out/${appdir}/libicui18n.so.42"
+    rm "$out/${appdir}/libicuuc.so.42"
+    rm "$out/${appdir}/libGL.so.1"
+    rm "$out/${appdir}/libpopt.so.0"
+    rm "$out/${appdir}/libQt5Core.so.5"
+    rm "$out/${appdir}/libQt5DBus.so.5"
+    rm "$out/${appdir}/libQt5Gui.so.5"
+    rm "$out/${appdir}/libQt5Network.so.5"
+    rm "$out/${appdir}/libQt5OpenGL.so.5"
+    rm "$out/${appdir}/libQt5PrintSupport.so.5"
+    rm "$out/${appdir}/libQt5Qml.so.5"
+    rm "$out/${appdir}/libQt5Quick.so.5"
+    rm "$out/${appdir}/libQt5Sql.so.5"
+    rm "$out/${appdir}/libQt5WebKit.so.5"
+    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
+    rm "$out/${appdir}/libQt5Widgets.so.5"
+    rm "$out/${appdir}/libX11-xcb.so.1"
+
+    rm "$out/${appdir}/qt.conf"
+    rm -fr "$out/${appdir}/plugins"
+
+    find "$out/${appdir}" -type f -a -perm +0100 \
+      -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
+
     RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
     echo "updating rpaths to: $RPATH"
     find "$out/${appdir}" -type f -a -perm +0100 \
@@ -83,6 +104,10 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
+
+    mkdir -p "$out/bin"
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+      --prefix LD_LIBRARY_PATH : "${ldpath}"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 595272b900af..919ba008392e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,117 +4,117 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.4.0";
+  version = "31.5.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "5e6592c5f0569fb56613ed34db895a2fa6c77f66"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "7f270aebf5de8c2f4a988d87b37cbdf12542a86a"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "611bbfb96b6f2b39c9a7b83311ba7f96e0294501"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "5b8dbb29e1dfce40d0414b75a2e889e40ba62b1b"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "8aef167276d82e3243912f1773ce42bc5831d6a8"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "81448779fcdcace457e7b3e37262345df9b100ec"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "4f82e7bfd24086e98721c6283156781a0a65e23f"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c3ddd6613f7591ff7d4aad1e39358f7107e56b5d"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "68340eea06073ddf2c64f2808d5136295962ebb5"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c080fda6eb86414e3157a54befcd9bf7e5a87148"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "087a853427912f6aef3802851cf61d8c36aaad93"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "b574ee98d1771d4a4be77a5e1f7573d03329d497"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "4e56ed5b93e8aede015b4ba3b86d0121f5225e21"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "8ca5266e9ad8c1f24a9426cd41b4f9af764308b1"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "3e612559375de82f227fbdfad847bef58392ed64"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3aeb7ca07b82258353b1085705e6f0f18c3a3813"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "7d09b5f73738ea9ea16c515434299df8654bbc1e"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "3c7b5dafca343afa0be3d107078c42d525149ab7"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "5273088e2ad5278fbec29a3d80ff81123807bdb1"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "d18893827828640ff83df8b3d340ed96312d4bfb"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "dc0f3ecb015568805634ee78f5ec314d2502ae63"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "ca7c336b9902c7f109c58e20d944c019cc3003dd"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "a7164e94562e7c711e0a8ca98cb9994c75aa4538"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f53acad0af7a080e310b7a875b6cb6776d691fcd"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "7c31b23b0dfe89c17c0eef61cc605f2ea6a5fca3"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f837d7d1916d687e4482abb87b74de90c4131b4d"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "80d6ad181ba25b3b65eb9fd990f03a1aadd68a7b"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f40f6514a2357aecabdc34708bbc819fb6546a70"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7c0d9500321fe5c854ba7f1f11cd1cfcec895919"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "afa2780e35a8fb95b26f43595c2e7729e7d37360"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "711bf1da10758f784e5c31b3673eb612604775b9"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "02ee282d0b54ad6490e742f7a3b29763bf1d0545"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "940125468f0129138e20a048fe09d3d489bab478"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "357a64c3b49e3d058ed715de24296fa6533dbe59"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "abe4633376f244efffbd3faa7be4381a5dce0dcc"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "f401ae0b0e51603249f6a7b925166bf287023dc7"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "f563e7f6638da931c3e8b3b8055d8ea1923af204"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5ebfc7889ad5fa147c50e70a66b42238dc289ffd"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a7c6c74459ac9ecae0b325765ae9fb3e2adab1c5"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "923de165c7eb693316d4a81ad13e32636c1de990"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6685e21a2b20ebb35da479604dfbf719b0822c3e"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "35d4f00f26c3bc18c7a6ebcc6d6d2ccd0a4499d4"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "7ad9d25363f3b98085758fb2815d4fbf0b898b28"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "ddb0b68b311e51f602248924b4b49481a64ac175"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "216df56d5dde4f27d0f14cfaafd7af08a2732bf2"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4c30c0ba4bbe22522565679b49b06d62673fbd74"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "7f67f2fe2166d207f7fa39feb85faae4595cbdbc"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "f5949cb31f01b11cb6a43a045798da64abea52af"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "c6d784d2cd3f3baf6737dfd2d28c03f9b1c37623"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b5598bc5a19b45ee17cfd259f7da581735f90430"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "21699446dbcc9e0fb53e06dafec8efdbf6ab484b"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "e64a219956f4aa017ee742cc1768567052593282"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "a60b5d60e8436355ee24029a4398168108ce8aea"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "583af341312ea29b50a7eaa86d2c9758ce2f5735"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "2471ebfc64a84e8711d7bc26783a16d6300ada07"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "d67b28477e36501a03ce8fd79a23090d068a696e"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "f53018a38f84c7e4fc8d5a3ee952478d4a1c9ebe"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "f886bcdb98af1c217a837c10a5e0737cbd357ef0"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "000d8e56b62768aee6dba9cb14b733f78908e751"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "27ffbd773f977b67903a62b9131b1dcda27dd7f2"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "cd743c00682001094d3a7decd8396b6ce9b1e67e"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "64b8ba26bb1f85788321bd2ba38b4813859ebede"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "445731309b578c262547f22364dfe1fd0eaf68d5"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "9bc2efd19b17c0e09b55e6ae310e59147212d726"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "35a275d39c2a780b86749891c14ee77ca36f03bf"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c70f2f57e1fd8c40da949a18314c30380728f7bd"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c94ace97f23a6fce1e736bb334ddf6af3d5a0ff4"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b00717ab99a47ef3477fecb79d55dc5817c60c1e"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "a5864e976675278cb9fb7e65c1edb88f704557f1"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "dba80bc2bc1ec67ba932525d05253803292bc9d8"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "161e1361b1ecc5f1ee31227b7e65705ab5355432"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "8051e55e5f7fbc42c7d75b5ad28834d11b699833"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "91c8812e39baaa1974d4d1c316c7c08022f3408f"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "948a679c843cee3f8da80f0a45b5416c7cc3b37c"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "43005f6337f33171f745f2e493d8cf2a8371d143"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "78fea3bc7e24eb96aefb2e52b01657437fc9dfd6"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0a5b4e14446c0f8f44004178f873bb289176e1b6"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "727d4a82754118749ea48e4b7ab6d182570957ad"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b4418f18b3569991ff2aca4528e70dd49247d81"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0ffbee08f3e43fde37913679037d59b68a47d49b"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "79606026969e837b4b9a1be73b71b0b183757504"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0680dfa0417688e2ad6307b10f90c766db139789"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "d06f4e7f748ffa8202bfc1dc0c4bc94894feb223"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a998af6413eec1123c9e4698ce217dc856c2bb4e"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "062a1ba9c8a5c06972895ebb11e12d90a50c450d"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "fd149bdbdc4a697cfab1d04b818b09718a3b945c"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "50105a554db09e57ad99aee5c3b9c9f35eef3431"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "ed360ef7cbf2ecc70b08922c27cdf3525c392137"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "34dee72d71916209a3cad28e6adfa1b3270567c6"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "cfe76d345c17ab8711a723779d263c3baa0016ff"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "391a923ff56ba6adf15817b12eec4555ede578fe"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "b6c3ad0b50610fd2470a2366c58a2e4947a96698"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "f422d3adca0f15b70d53c9c9b9bae09d651ef535"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "d3c8c82a0531a20480ac93dc6e0c981068a327fc"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "9d7ab49903107da8cd9859d09ae62dea661130a9"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "24f770326910db0ebd3d521b7573f57c4db2afdd"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "b93a538462e364202cf0a7ef9867f3bcaad5256d"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "b2c6c917b6575002f2f9f548ba1ae0aa3bd7a064"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e0d34774514f264bb02a2c5db76270bc228e80a8"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "8119ba8f521da39af4d729fe52841c76e6a9c6f1"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "76b9c748286ac40cb77b2dfe98e44b1ebadc6d9b"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "779ed971dac93d55e45a63e0ff4d3f6118317116"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "784a6432f04dc12f6abb405e4375540bb3c1bfac"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "d6ec1ca2015c723d05e4f7a6e6006cb0f5f45667"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "e494cb50a3c99b4e96794544b1a7948663d0ae28"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e9a8d6fb2b9328f7ea80c0d7be9943daaf37e71d"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "14624e631eb3bdfb9cde339dbf132e048f68f1c3"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1197fa99680d978b10c41ccac7183117c264f375"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "78c73c73363b41b3ae36cea01cc64bc715602278"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "76faeef7919eb2fb594773502ee5202ed11b67e4"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "d36881e451b6a2f37d915aad58d05a21bb87f7d7"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "21274f27a373bfbef19be027e5d29072ca60c9a1"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "b01f2b2b84fec43aa53b72eb1298b502f7fe710f"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "9ca6a14bd622b10e4a44d3aec496f610752c1e87"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "194a8808c66a48bf7da08ff119a7000088fe6cc5"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "4c2b3ee21c098894aea655b428459ae06f9d62ea"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "bc218d49b4e43fd3f05b7c4c8906b3da88e828d9"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "8bb02681a93dd6f0607b6a0b9ed53051fc628fa1"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c5cfd8d422751908cab17b741f4ed964de65a4f4"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "80a5486d4150cdc140fc7c215927b9a49de7753c"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "401a491875fc0bc8d80650d83f7c70e6650c99df"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "0a76c907d2bcdf877a73fb098a7a0d269e40a624"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "4da40bb96d58d1465fab3cb23825d298140c81a2"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "c9e792e8d871b942e67c7d8b7471a7c40dc1d1de"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "a0da8667faf948049adee23a8c68320eb0af0d4c"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "de9c5cb34defca191cba287a3088179b52385e51"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "2a4c69398a3aa4dfe2c3d79330021e243893a660"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "2a24cc02c39be286de1c0407b5187effb3f74cad"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "292c4de929c96302d10b235788b985281ed1a36c"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "30ff8eacbe14d0b7d0fe4c8854d0b20af1fdbddb"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "1092950cb1e9297a976b1e81a53b20bfa908c27f"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "8eb096336f0a585922c31905534e8314dbe69f05"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "3c18093229125d47078da68cfbf785c96d8bdcc1"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "7c9546c119585111c20bf9f0a7da38c1359e8bae"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "9a8c3ddf64900335a0da340da67e291fd9135c78"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e00004d79733ba311f7b3586228c4c481935f9e6"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "c5a60aaf75baf0cfc56575cd40bb61594c66dad0"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "e95dad323e8e6c1eb401b9528f16825b6d4defef"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66adbf58ccd65b6b60ef4196e13cf1b246151c6e"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "35ecf91137560f06445007bbee54cbf8c5b9c438"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "d7ab0d4874a95cb2234b076906eeba14d9a76507"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "82f944cbc95eeb10e6b46a20d8bd5b031800c87b"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "1494e4dfdb95d0e6d62265536016601501277b7a"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ca36606b18739f155a18637f6ce392bf466ba666"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "dce9299b7bc905377566caa7e0289620e2d7e84f"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "6477fab8e95032bc57faecbb2240844a8d0314d5"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "e8fbd234f3e35d8dcb0acb2d3fbdd2b03d9c06e1"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e2fb441f96c407371ed02e86d42b63e7e38107fa"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "2798b02de295269ee7a0792bc89c6c9f809bfab0"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ee398047c681098af9c5ad17101d34fe1699d038"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "739d34bf1b8ab785194b6c591e636bc4826b908a"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "518bce26ebb68021c4dc6a8472e3f267648746c4"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "5791da2bc93aa945f8f21b2896b80ae3b88f1bf6"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "f576688726132e0c0b8b07f37dda5dfdac0dddd7"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "95bff6f384ae2821857b3ae71b76aa5440ddd3e2"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "7237149162123580592769f66b48be83ad358df5"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "8bf0ba0630601e8773eb4117ea800a2d32e5c920"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "de5ab889e9ccc204f7abfb7e3e52e4ec6edbcc47"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "3a6030ec8f310e5b1b154e0cfd9b75142df4c282"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "0af6b30a39141e887b5ad14fb16bb71047dbd28e"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "bc84640dcf855612668a0c457a01ee0239440447"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "a96c48529e7f4a50840903d212d9cacacd5d5d94"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5ae8b3ad145fd1fe9d83b450b588ae85f3371489"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6c911464a02b65f84da08717cface89029e9a2cf"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "19b98a36c5b64a1ac6db72b6d21e6b3c9919b3bb"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "88bbe2609b8e84050dfab1c6ae313b4ac5c1f619"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "24cf25824357b570ddf99445ed6ce5e02f61ac2f"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "f6cd888e6ae5c67cf35a811f087ace294ca80883"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "5fbeb845a3e9237b61a77e552927fd1cf41eb369"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "77015135696730a9412a2ef180564e53bfc41074"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "df807e1255871ecaa6487853798fb86e4228745c"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "cdfaf85e81edad783059b2a7b6a5af19ec48e8f3"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "3cd01ce359c500db39edefa75275bbd42244f344"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "52918cadfa61a4f3903f35e34583b9554446ad98"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "ade54d46de66db43de1490523e23434c9cb69103"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "52cd293a4329b51b40ff8d992dd2f980f6e8a7cd"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "693b2d513df0a0f6b31adf9349c6627816b5c14b"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "be7c2f7a4988998ad19d5a87c28dbe2b06dc7d75"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "3920a26c7ac2f66ab7d2ea5d37d58471d9cea804"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "f034ad4e4c347d6e2d4893b932c969c581cd51ad"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "23e21892a7b08fb320c2af2711bbb44347de07e8"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "6177e5dca5ee9b703e585489610b874ab16b67d3"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "ab89eca3573f847ce9c4757910303ec3647d010e"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "4ccde5395018e719bd5f0d835ead47a272578685"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "b1d15bc7c70deb8e00bf458082a8c2a4577ec6e2"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "fd146e4fb01ca78bcfe6ca2cd560a8252c37e561"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "bb63c5a778ab9c819b742393bdd67e347b18943b"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c619bec7acc717dc3fe7718c5b9b27a0aab2bb86"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "42c13c4381d1046d8982f2891e45cc13becc5eab"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "610d59c9b8e8bbb61937a205db70605cf99b4684"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "349481180512c188a1114e7c9c5aea6f39793137"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "b3bb61a6e2bc36af8521b1be44330f348e6019ab"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "211ef0e28c892f069c79be028cead4f484224977"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "9868443f482a00cdd0d68106afcdd002f74d8232"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "1b722932dd8b3b517c61ec50588a917bc7a5d934"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "9465eded1480ddf1e807de2ee8b2d10e7bcf9f0f"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "ddf30543b88f0dbab951ef76f93d4e9cef47bc00"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "5e0ecf9899cdbc63530e0b0bc72e585abb721863"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "38d6815aa5837005dfcb78cf25057a1f04b52da4"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "c5e2a1c6d67e41c318b13e81cdc7b6dc36d1798a"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "6bc59e32db280aa2300b649b175330c7d503776d"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "39f5965ead13d55c0b84f633dff645e8bc2111c0"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "a06151bcacbc504da1351cda4f84539a2ce9afc8"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "e453d23bb265d4d5e729fb7f4f65553ec8d72250"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "6c6f0e1bc7e2327d05484628298a204897b379bd"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2044a84b1fdcae2aa2ae5aec9132543ed10792ed"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ecd19886aed7b721172be2a030e3b9d1a752a648"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "904ed03d02ceebed11505f95ccf158aa022d6aa5"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "4f9ec99fdb826957ef109a7665a97fe223a88d50"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "0bae36b2aac4e06bdf4b0b210f3179d15a074e8e"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e0ab549d8f4df80f8b7dc4fa978142935f103140"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "2c0b7ca57916bac4846ec1702094c02452a05a0d"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "80af6c1ad5a226249f91b9ad40aa1fa2fae4e4c8"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "6a2de95d4e501fa0eed932d36e7e667746e89af5"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "7246575cd970737c8dd9ad84ad28316efcb37b7d"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "84f798a483558b24cfcbfe44af8c9d1c0acffc28"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "dda34b5b7026ffcd37b982968ac0815f02c082e2"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6a63ad1c758f639aaa8ee20b3153811514810425"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "a3b378d077ef57ed52130df662c5b68208527cc1"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "857cb387742c175e8b31a0b2171de5ab27531141"; }
   ];
 }
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index a1528dd1255b..e66f78f2602d 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -2,6 +2,7 @@
 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
 , substituteAll
 , pulseaudio ? null, cups ? null, pcsclite ? null
+, buildServer ? true, optimize ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -33,7 +34,10 @@ stdenv.mkDerivation rec {
     "-DWITH_CUNIT=OFF"
   ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON"
     ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
-    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON";
+    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
+    ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"
+    ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON";
+
 
   meta = with stdenv.lib; {
     description = "A Remote Desktop Protocol Client";
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 5f328a4cf87a..62535298060a 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -56,16 +56,17 @@ let
 
 in
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1cg82zwzi6qh8s8w3716ikm1l1sigl9h6pd9ffdrp3ja4r2drp48";
+    sha256 = "110m4kdnggw0g1sl8jp3gjgjc3q7qb013dba0ggpvlqc8mwm4rg3";
   };
 
-  buildInputs = with stdenv.lib;
+  buildInputs = 
     [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
     ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index b810adefab16..ee18f86893bb 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -142,7 +142,7 @@ let
     cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
 
     # copy content of multiPaths (32bit libs)
-    cp -rsf ${staticUsrProfileMulti}/lib/* lib/
+    [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/
 
     # copy content of targetPaths (64bit libs)
     cp -rsf ${staticUsrProfileTarget}/lib/* lib64/
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 01605b35ef32..486fd3acafb7 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -254,6 +254,7 @@ clone_user_rev() {
     local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)
     echo "git revision is $full_revision"
     echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
+    echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)"
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 768d173934d5..29ff5c31e45e 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -19,4 +19,4 @@ fetchurl ({
         --clean "$out" > "$tmpfile"
     mv "$tmpfile" "$out"
   '';
-} // args)
+} // builtins.removeAttrs args ["stripLen"])
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 0fcbf2f3d0da..0d7534e67587 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -13,6 +13,7 @@ let
     stdenv.mkDerivation ({
       name = "mirrors-list";
       builder = ./write-mirror-list.sh;
+      preferLocalBuild = true;
     } // mirrors);
 
   # Names of the master sites that are mirrored (i.e., "sourceforge",
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index df3f3ec82246..1953152fdd80 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2014j"; in
+let version = "2015a"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52";
+        sha256 = "0k4fy5x1813az0dwh82v5dhnvivfxxjin2szkgyfga00gn8r0965";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z";
+        sha256 = "06fxf9yw39wcpqifxf3lr8cn64nlwznqcyhd0cs2z1c6y88snnw8";
       })
     ];
 
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 36c05195e37c..bcbe28f23351 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python }:
 
 let
-  tag = "1.29.3";
+  tag = "1.29.10";
 in
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   srcFC = fetchgit {
     url = git://github.com/kripken/emscripten-fastcomp;
     rev = "refs/tags/${tag}";
-    sha256 = "ab44554dc43eee5552ea04c134a5aaff2cd32f6f6528f58a24025bcd8fd1d46e";
+    sha256 = "eee0f884c7e10e1b869b9d3afbb03bf69c63ec0560b136e3e8cd64ca00a41653";
   };
 
   srcFL = fetchgit {
     url = git://github.com/kripken/emscripten-fastcomp-clang;
     rev = "refs/tags/${tag}";
-    sha256 = "cc6dd704f5eba64fda931833479003bf3c8d9cf781bbaac3aa22a7b2644ccb26";
+    sha256 = "22c48e85dfacd9f2349d37fb421f0f848b65fc7b39e66984d04349ee3271667c";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index cc7982345d42..efe8be2051ff 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  tag = "1.29.3";
+  tag = "1.29.10";
 in
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/kripken/emscripten;
     rev = "refs/tags/${tag}";
-    sha256 = "7f65d1d5cc1c1866554cd79ff83f87fc72a7df59cf1dfd6481e3f0aed5c7dc1f";
+    sha256 = "0d7ed2b801ac37acaf907bd03ba42cce3ac4a4c330bf1ef28de25bbb3f39ba87";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index 4bfb4f912879..ac433ac90a18 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -5,14 +5,6 @@ stdenv.mkDerivation rec {
 
   src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar";
 
-  patches = [(fetchpatch {
-    url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
-      + "?r1=208730&r2=208729&view=patch";
-    sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
-    name = "bug-18548.patch";
-  })];
-  patchFlags = "-p2";
-
   # The gcc the plugin will be built for (the same used building dragonegg)
   GCC = "gcc";
 
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index e6460b5d509a..71271ee7ed87 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20141206";
+  version = "20150214";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj";
+    sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d";
   };
 
   buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index da59527dff43..bc18b1dc3aca 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -7,8 +7,8 @@ self: super: {
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
-  Cabal_1_22_0_0 = dontCheck super.Cabal_1_22_0_0;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; });
+  Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1;
+  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; });
 
   # Break infinite recursions.
   digest = super.digest.override { inherit (pkgs) zlib; };
@@ -43,6 +43,20 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
+  # CUDA needs help finding the SDK headers and libraries.
+  cuda = overrideCabal super.cuda (drv: {
+    extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11];
+    configureFlags = (drv.configureFlags or []) ++
+      pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
+      "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
+      "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include"
+    ];
+    preConfigure = ''
+      unset CC          # unconfuse the haskell-cuda configure script
+      sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure
+    '';
+  });
+
   # Depends on code distributed under a non-free license.
   bindings-yices = dontDistribute super.bindings-yices;
   yices = dontDistribute super.yices;
@@ -206,6 +220,7 @@ self: super: {
 
   # These packages try to execute non-existent external programs.
   cmaes = dontCheck super.cmaes;                        # http://hydra.cryp.to/build/498725/log/raw
+  dbmigrations = dontCheck super.dbmigrations;
   filestore = dontCheck super.filestore;
   graceful = dontCheck super.graceful;
   hakyll = dontCheck super.hakyll;
@@ -216,6 +231,7 @@ self: super: {
   postgrest = dontCheck super.postgrest;
   snowball = dontCheck super.snowball;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
+  wai-middleware-throttle = dontCheck super.wai-middleware-throttle;
   xmlgen = dontCheck super.xmlgen;
 
   # These packages try to access the network.
@@ -378,6 +394,9 @@ self: super: {
   xcffib = dontCheck super.xcffib;
   xsd = dontCheck super.xsd;
 
+  # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
+  hspec-webdriver = markBroken super.hspec-webdriver;
+
   # The build fails with the most recent version of c2hs.
   ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
 
@@ -449,9 +468,6 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # https://github.com/d12frosted/CanonicalPath/issues/3
-  system-canonicalpath = dontCheck super.system-canonicalpath;
-
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 
@@ -492,46 +508,27 @@ self: super: {
   # https://github.com/anton-k/temporal-csound/issues/2
   temporal-csound = markBrokenVersion "0.4.1" super.temporal-csound;
 
-  # https://github.com/gregwebs/haskell-heroku/issues/9
-  heroku = dontCheck super.heroku;
-
   # https://github.com/seanparsons/wiring/issues/1
   wiring = markBrokenVersion super.wiring;
 
-  # https://github.com/gibiansky/IHaskell/issues/355
-  ihaskell-parsec = markBroken super.ihaskell-parsec;
-
   # https://github.com/jwiegley/simple-conduit/issues/2
   simple-conduit = markBroken super.simple-conduit;
 
-  # https://github.com/evanrinehart/lowgl/issues/1
-  lowgl = markBroken super.lowgl;
-
   # https://github.com/srijs/hwsl2/issues/1
   hwsl2 = markBroken super.hwsl2;
 
   # https://code.google.com/p/linux-music-player/issues/detail?id=1
   mp = markBroken super.mp;
 
-  # https://github.com/athanclark/lucid-foundation/issues/1
-  lucid-foundation = markBroken super.lucid-foundation;
-  digestive-foundation-lucid = markBroken super.digestive-foundation-lucid;
-
   # Depends on broken lmdb package.
   vcache = markBroken super.vcache;
 
-  # https://github.com/osa1/language-lua/issues/14
-  language-lua = dontCheck super.language-lua;
-
   # https://github.com/afcowie/http-streams/issues/80
   http-streams = dontCheck super.http-streams;
 
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # https://github.com/NixOS/nixpkgs/issues/6343
-  c2hs = dontCheck super.c2hs;
-
   # wxc needs help deciding which version of GTK to use.
   wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
     patches = [ ./wxc-no-ldconfig.patch ];
@@ -540,8 +537,13 @@ self: super: {
   });
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
 
-  # Depends on obsolete QuickCheck 1.x.
-  test-framework-quickcheck = markBroken super.test-framework-quickcheck;
+  # Depends on QuickCheck 1.x.
+  ersatz = dontCheck (super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }); # https://github.com/ekmett/ersatz/issues/8
+  HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
+  test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
+
+  # Doesn't support "this system". Linux? Needs investigation.
+  lhc = markBroken (super.lhc.override { QuickCheck = self.QuickCheck_1_2_0_1; });
 
   # Depends on broken test-framework-quickcheck.
   apiary = dontCheck super.apiary;
@@ -557,13 +559,35 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # https://github.com/fumieval/elevator/issues/2
-  elevator = markBroken super.elevator;
-  minioperational = markBroken super.minioperational;
-
   # https://github.com/mikeizbicki/hmm/issues/12
   hmm = markBroken super.hmm;
 
+  # https://github.com/alephcloud/hs-configuration-tools/issues/40
+  configuration-tools = dontCheck super.configuration-tools;
+
+  # https://github.com/fumieval/karakuri/issues/1
+  karakuri = markBroken super.karakuri;
+
+  # Upstream notified by e-mail.
+  snowglobe = markBroken super.snowglobe;
+  gearbox = markBroken super.gearbox;
+
+  # https://github.com/deech/fltkhs/issues/7
+  fltkhs = markBroken super.fltkhs;
+
+  # Build fails, but there seems to be no issue tracker available. :-(
+  hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
+  padKONTROL = markBroken super.padKONTROL;
+
+  # https://github.com/lambdabot/lambdabot/issues/105
+  lambdabot-core = markBroken super.lambdabot-core;
+  lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins;
+  lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins;
+  lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins;
+  lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins;
+  lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins;
+  lambdabot-social-plugins = markBroken super.lambdabot-social-plugins;
+
 } // {
 
   # Not on Hackage.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index bc558a7821e5..25f6b146f1e3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -38,7 +38,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_3_0;
+  binary = self.binary_0_7_4_0;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index dace434fda5d..982dd62cd8f0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -32,7 +32,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_3_0;
+  binary = self.binary_0_7_4_0;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_0_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index b7999bb43368..2a038a438776 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -39,6 +39,7 @@ self: super: {
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # These used to be core packages in GHC 7.8.x.
   old-locale = self.old-locale_1_0_0_7;
@@ -58,6 +59,7 @@ self: super: {
   utf8-string = overrideCabal super.utf8-string (drv: {
     patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
+  esqueleto = doJailbreak super.esqueleto;
 
   # bos/attoparsec#92
   attoparsec = dontCheck super.attoparsec;
@@ -84,4 +86,46 @@ self: super: {
   barecheck = doJailbreak super.barecheck;
   cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; });
 
+  # https://github.com/kazu-yamamoto/unix-time/issues/30
+  unix-time = dontCheck super.unix-time;
+
+  # https://github.com/peti/jailbreak-cabal/issues/5
+  ReadArgs = dontCheck super.ReadArgs;
+
+  # Until the changes have been pushed to Hackage
+  haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch {
+    url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch";
+    sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w";
+  });
+  foldl = appendPatch super.foldl (pkgs.fetchpatch {
+    url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch";
+    sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl";
+  });
+  persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";
+    sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw";
+    stripLen = 1;
+  });
+  stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch {
+    url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch";
+    sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g";
+  });
+  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
+    url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
+    sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
+  });
+  conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch {
+    url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
+    sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
+  });
+  wai-extra = appendPatch super.wai-extra (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/wai/pull/339.patch";
+    sha256 = "1rmz1ijfch143v7jg4d5r50lqq9r46zhcmdafq8p9g9pjxlyc590";
+    stripLen = 1;
+  });
+  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/yesod/pull/941.patch";
+    sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq";
+    stripLen = 1;
+  });
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 88e14b5a9e2c..7ac3f97d1ae0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -40,7 +40,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_2_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index a7465f7744d3..f9228b9013bc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -37,7 +37,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 14b6aa161de0..b12d30050132 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,7 +40,7 @@ self: super: {
   terminfo = self.terminfo_0_4_0_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
+  Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -87,7 +87,7 @@ self: super: {
       presburger pretty process QuickCheck random smtLib syb text
       tf-random transformers utf8-string
     ];
-    buildTools = with self; [ alex happy Cabal_1_22_0_0 ];
+    buildTools = with self; [ alex happy Cabal_1_22_1_1 ];
     patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
     description = "Cryptol: The Language of Cryptography";
     license = pkgs.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 20c82c0f2c3b..5aec41b6c0fa 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -82,15 +82,23 @@ self: super: {
   clac = dontDistribute super.clac;
 
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/1
+  hspec-test-sandbox = markBroken super.hspec-test-sandbox;
+  test-framework-sandbox = markBroken super.test-sandbox-quickcheck;
   test-sandbox = markBroken super.test-sandbox;
   test-sandbox-compose = markBroken super.test-sandbox-compose;
+  test-sandbox-hunit = markBroken super.test-sandbox-hunit;
+  test-sandbox-quickcheck = markBroken super.test-sandbox-quickcheck;
 
-  # https://github.com/alephcloud/hs-configuration-tools/issues/38
-  configuration-tools = markBroken super.configuration-tools;
+  # These packages need mtl 2.2.x directly or indirectly via dependencies.
+  apiary-purescript = markBroken super.apiary-purescript;
+  highlighter2 = markBroken super.highlighter2;
+  hypher = markBroken super.hypher;
+  purescript = markBroken super.purescript;
+  yesod-purescript = markBroken super.yesod-purescript;
   yet-another-logger = markBroken super.yet-another-logger;
 
-  # Needs mtl 2.2.x.
-  hypher = markBroken super.hypher;
+  # https://github.com/frosch03/arrowVHDL/issues/2
+  ArrowVHDL = markBroken super.ArrowVHDL;
 
 }
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f22d2d7e5079..faf1ce4046e2 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -228,7 +228,7 @@ stdenv.mkDerivation ({
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
 
-    ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin) ''
+    ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
       for exe in "$out/bin/"* ; do
         install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
@@ -241,6 +241,8 @@ stdenv.mkDerivation ({
 
     inherit pname version;
 
+    isHaskellLibrary = hasActiveLibrary;
+
     env = stdenv.mkDerivation {
       name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment";
       nativeBuildInputs = [ ghcEnv systemBuildInputs ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 482ef44f374f..201826b1e897 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -839,6 +839,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ArrowVHDL" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "ArrowVHDL";
+       version = "1.1";
+       sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
+       buildDepends = [ base process ];
+       jailbreak = true;
+       homepage = "https://github.com/frosch03/arrowVHDL";
+       description = "A library to generate Netlist code from Arrow descriptions";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "AspectAG" = callPackage
     ({ mkDerivation, base, containers, HList, mtl, template-haskell }:
      mkDerivation {
@@ -2013,7 +2026,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Cabal_1_22_0_0" = callPackage
+  "Cabal_1_22_1_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
      , pretty, process, QuickCheck, regex-posix, test-framework
@@ -2021,16 +2034,15 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.22.0.0";
-       sha256 = "13984rli87vzhl5pvpny2cns8dq4k2s5bgmr8n93iw9hrx5w3j48";
-       editedCabalFile = "ba2fe0628c1afb8f9127c8828264cb18967a8d08c4230a93a79ae322a4c2cef8";
+       version = "1.22.1.1";
+       sha256 = "1m9yyan2f6l2r00f0sibikcj2kdrk313r5lhr20dyiyw2dlm33iy";
        buildDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
        ];
        testDepends = [
-         base binary bytestring containers directory extensible-exceptions
-         filepath HUnit process QuickCheck regex-posix test-framework
+         base bytestring containers directory extensible-exceptions filepath
+         HUnit process QuickCheck regex-posix test-framework
          test-framework-hunit test-framework-quickcheck2 unix
        ];
        preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
@@ -4698,7 +4710,6 @@ self: {
        homepage = "https://github.com/thomaseding/fungi";
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GA" = callPackage
@@ -5050,7 +5061,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenI" = callPackage
@@ -7268,7 +7278,6 @@ self: {
        jailbreak = true;
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaXml" = callPackage
@@ -8795,8 +8804,8 @@ self: {
      }:
      mkDerivation {
        pname = "Ketchup";
-       version = "0.4.2";
-       sha256 = "0kxaz49iz195bbby73cva6c68h9f8f4pk0a8jamcsiyvbx4yw69x";
+       version = "0.4.3";
+       sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1";
        buildDepends = [
          base base64-bytestring bytestring directory mime-types network text
        ];
@@ -9252,9 +9261,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "List";
-       version = "0.5.1";
-       sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p";
-       editedCabalFile = "0fce39feed0d5ae7ea041b886d5440e288b705212b1869beec6419b9c0ca9982";
+       version = "0.5.2";
+       sha256 = "1b7ar17d2sq6ibgbiqbsrhk2zlxcxiwfv2xsfbya5hs8nflzkp97";
        buildDepends = [ base transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "List monad transformer and class";
@@ -9900,8 +9908,8 @@ self: {
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.5.0.0";
-       sha256 = "0vmrfng90bn09sci2vzlhhvvkrbis1hpi9hsba0h8a8b9ac1bjax";
+       version = "0.6.0.0";
+       sha256 = "05fvnkpq37a4ab97lcv460znnq86csivyz3v6cmq08mnvsjf6cpl";
        buildDepends = [
          base ghc-prim MaybeT mmorph monad-products mtl transformers
        ];
@@ -11811,6 +11819,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "QuickCheck_1_2_0_1" = callPackage
+    ({ mkDerivation, base, random }:
+     mkDerivation {
+       pname = "QuickCheck";
+       version = "1.2.0.1";
+       sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
+       editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9";
+       buildDepends = [ base random ];
+       homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
+       description = "Automatic testing of Haskell programs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "QuickCheck" = callPackage
     ({ mkDerivation, base, random, template-haskell, test-framework
      , tf-random, transformers
@@ -12215,8 +12236,8 @@ self: {
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.5.0.2";
-       sha256 = "0w4p1na6ksvsy9dc8lcpnkvj7x2d6n6w79ndzy257iqfcf03n1kc";
+       version = "0.5.0.3";
+       sha256 = "0yhcshc6hdkny6llxab027ndyshy9ghk5jb86jrzp9rkzd8z965j";
        buildDepends = [
          base dlist FontyFruity free JuicyPixels mtl primitive vector
          vector-algorithms
@@ -13157,6 +13178,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SmtLib" = callPackage
+    ({ mkDerivation, base, parsec, transformers }:
+     mkDerivation {
+       pname = "SmtLib";
+       version = "0.1.0.0";
+       sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
+       buildDepends = [ base parsec transformers ];
+       jailbreak = true;
+       homepage = "https://github.com/MfesGA/HsmtlibParser";
+       description = "Library for parsing SMTLIB2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Snusmumrik" = callPackage
     ({ mkDerivation, base, bytestring, convertible, cpphs, directory
      , filepath, haskell98, HDBC, HDBC-sqlite3, HFuse, hslogger, iconv
@@ -14185,6 +14219,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "TypeNat" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "TypeNat";
+       version = "0.1.0.0";
+       sha256 = "1j5v4kmd3hxzzm6xrhxf2vh7rn3b8n4gzb1yppgvxng06p642snb";
+       buildDepends = [ base ];
+       homepage = "https://github.com/avieth/TypeNat";
+       description = "Some Nat-indexed types for GHC";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "TypingTester" = callPackage
     ({ mkDerivation, base, containers, directory, time }:
      mkDerivation {
@@ -14862,8 +14908,8 @@ self: {
     ({ mkDerivation, base, boxes, cmdargs }:
      mkDerivation {
        pname = "Wordlint";
-       version = "0.1.0.2";
-       sha256 = "0v3kl5cfwjigrhxw534h628qlzw52w6gd4n6ri8cqjmvkgklr5vp";
+       version = "0.2.0.0";
+       sha256 = "0vrfwx4276lyyz2z36nkjq5a0n3v53axf23mikc7m40fl8snp6l7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base boxes cmdargs ];
@@ -14902,7 +14948,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "X11" = callPackage
@@ -16218,15 +16263,14 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.1.0.17";
-       sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb";
+       version = "0.1.0.18";
+       sha256 = "1q2j7mx8a3mwsb809iyrr2d66bwn4na3y7hmisy6dq8jx4ajfrbk";
        buildDepends = [
          array base newtype semigroupoids semigroups vector-space
        ];
        testDepends = [
          array base newtype QuickCheck semigroupoids semigroups vector-space
        ];
-       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16727,7 +16771,6 @@ self: {
        homepage = "https://github.com/noteed/aeson-streams";
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-t" = callPackage
@@ -17421,7 +17464,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa-midi" = callPackage
@@ -18292,7 +18334,6 @@ self: {
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -18760,18 +18801,17 @@ self: {
      }) {};
 
   "api-builder" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, either, HTTP
-     , http-conduit, http-types, text, transformers
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , either, HTTP, http-conduit, http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.2.0.1";
-       sha256 = "1iq4amj33rrp1vywrxjdh2yg3ry2q038n3z0pkisdjl9ga4bvv0f";
+       version = "0.4.0.0";
+       sha256 = "1vkk47nq0w6v4gv35s8vy7hmsj1hswxqvbrgnnyzp0y9w74h4nl5";
        buildDepends = [
-         aeson attoparsec base bytestring either HTTP http-conduit
-         http-types text transformers
+         aeson attoparsec base bifunctors bytestring either HTTP
+         http-conduit http-types text transformers
        ];
-       jailbreak = true;
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18895,6 +18935,7 @@ self: {
          apiary base blaze-builder blaze-html bytestring cookie time wai
          web-routing
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20234,8 +20275,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.3.0.1";
-       sha256 = "1j8x28d2n5ivyrxs35ka2sahnj9d94izr2sihhgppjcgsnm93c8m";
+       version = "0.4.0.0";
+       sha256 = "0m74k68sx2zdyn1wjc344v18cnpbkvzy9r4lvf9cm0h2vsjrlgrq";
        buildDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -21106,8 +21147,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.2.0.3";
-       sha256 = "16djyvzdmqssfsn97sjzmnq592bzxva4jsjdmxlp6yryqr8ciji3";
+       version = "0.3.0.0";
+       sha256 = "0rc2r8adw4j667iicncvf266mc65f1agj50q8x6hn1fm8pa8ssa7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -21189,7 +21230,6 @@ self: {
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-route53" = callPackage
@@ -21434,6 +21474,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "b9" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring
+     , conduit, conduit-extra, ConfigFile, directory, filepath, hspec
+     , hspec-expectations, mtl, old-locale, optparse-applicative, parsec
+     , pretty, pretty-show, process, QuickCheck, random, semigroups, syb
+     , template, text, time, transformers, unordered-containers, vector
+     , yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.2.4";
+       sha256 = "1s18423025r36gfvirwjx7p6zv612w0zsrdpchqzpp82jj989ym0";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson async base bifunctors binary bytestring conduit conduit-extra
+         ConfigFile directory filepath mtl old-locale optparse-applicative
+         parsec pretty pretty-show process QuickCheck random semigroups syb
+         template text time transformers unordered-containers vector yaml
+       ];
+       testDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "babylon" = callPackage
     ({ mkDerivation, array, base, containers, random, wx, wxcore }:
      mkDerivation {
@@ -21445,7 +21514,6 @@ self: {
        buildDepends = [ array base containers random wx wxcore ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backdropper" = callPackage
@@ -22685,15 +22753,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary_0_7_3_0" = callPackage
+  "binary_0_7_4_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.7.3.0";
-       sha256 = "0pv6zd1k3axn3dd7cva6pc1jrmkszgrzwqk6ck3gcl841fj4l4xz";
+       version = "0.7.4.0";
+       sha256 = "0zpyg1m5ihpdlglddnprxhx3pql0h866x5mz4qzfn7ppma6ahccb";
        buildDepends = [ array base bytestring containers ];
        testDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -23038,7 +23106,6 @@ self: {
        homepage = "http://code.accursoft.com/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings" = callPackage
@@ -23556,8 +23623,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-nettle";
-       version = "0.1.1";
-       sha256 = "1cd2yya6qhcx6vxsjdrlzkrj4k5nd15bz8fnkhhl2vm6r1w9jzq4";
+       version = "0.2";
+       sha256 = "1pk2gwd5wbs1bhna5npwrzrvd6cxss8sbigsa8lsqsarh8mbd5sr";
        buildDepends = [ base bindings-DSL ];
        testDepends = [
          base bytestring hspec HUnit QuickCheck quickcheck-io
@@ -24475,6 +24542,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw";
        buildDepends = [ base blaze-html text ];
+       jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
        license = stdenv.lib.licenses.mit;
@@ -24492,15 +24560,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "blaze-builder_0_4_0_0" = callPackage
+  "blaze-builder_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, utf8-string
      }:
      mkDerivation {
        pname = "blaze-builder";
-       version = "0.4.0.0";
-       sha256 = "0xhxz2g7hgp892n8qcq7iw136fv2csw9aaq8123srs05z9j1lcfk";
+       version = "0.4.0.1";
+       sha256 = "1id3w33x9f7q5m3xpggmvzw03bkp94bpfyz81625bldqgf3yqdn1";
        buildDepends = [ base bytestring deepseq text ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -24560,14 +24628,15 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-html";
-       version = "0.7.1.0";
-       sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja";
+       version = "0.8.0.0";
+       sha256 = "05afa3g9fbr0hnw8x794d7s8vzr0il9lkc2w67ks7hli78wl1y5b";
        buildDepends = [ base blaze-builder blaze-markup bytestring text ];
        testDepends = [
          base blaze-builder blaze-markup bytestring containers HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -24627,13 +24696,14 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-markup";
-       version = "0.6.3.0";
-       sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll";
+       version = "0.7.0.0";
+       sha256 = "0ifjf6n7hzcc11g3lhwdmzxs2qa3va7snn5m7i948gbffpkkr3pp";
        buildDepends = [ base blaze-builder bytestring text ];
        testDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -24643,8 +24713,8 @@ self: {
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
-       version = "0.3.4";
-       sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3";
+       version = "0.3.4.1";
+       sha256 = "1bfxl2jwr622kgf4gz4gqpdrvscciqpfyzy6qad8j7w633xg8vrp";
        buildDepends = [ base blaze-markup mtl ];
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
@@ -25392,20 +25462,49 @@ self: {
      }) {};
 
   "buffer-builder" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, mtl, tasty, tasty-hunit
-     , tasty-th
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, HUnit, mtl, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.1.0.0";
-       sha256 = "0pk3k3x03m9c7x7bgf9sah6wr4ry5j7hcdl5cp2v80d4nbkcdxx0";
-       buildDepends = [ base bytestring mtl ];
-       testDepends = [ base HUnit tasty tasty-hunit tasty-th ];
+       version = "0.2.0.3";
+       sha256 = "154v17zgmp65a84cfij8qdankhsyww0avh5a5lqsqll6w3dxj6n9";
+       buildDepends = [
+         base bytestring mtl text unordered-containers vector
+       ];
+       testDepends = [
+         aeson attoparsec base bytestring criterion deepseq HUnit tasty
+         tasty-hunit tasty-quickcheck tasty-th text vector
+       ];
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "buffer-builder-aeson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, buffer-builder
+     , bytestring, hashable, HUnit, integer-gmp, QuickCheck, scientific
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "buffer-builder-aeson";
+       version = "0.2.0.3";
+       sha256 = "0i8jv5w016m8az6g809mf54wbkz1dci5w4c7w94rxl2xhsx7q98p";
+       buildDepends = [
+         aeson base buffer-builder bytestring integer-gmp scientific
+         unordered-containers vector
+       ];
+       testDepends = [
+         aeson attoparsec base buffer-builder bytestring hashable HUnit
+         QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
+         text unordered-containers vector
+       ];
+       description = "Serialize Aeson values with Data.BufferBuilder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bugzilla" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
      , containers, data-default, http-conduit, http-types, iso8601-time
@@ -25773,8 +25872,8 @@ self: {
     ({ mkDerivation, base, bytestring, deepseq }:
      mkDerivation {
        pname = "bytestring-builder";
-       version = "0.10.4.1.1";
-       sha256 = "13dajygfpqxl1w875lj9asyhbzz0psi4lk73wiwll41p8brlrjrn";
+       version = "0.10.4.1.2";
+       sha256 = "0gp0ymz551qhxx3n3lxjhrr1fwcyd2qpn2y690k8qi6nc09sn14y";
        buildDepends = [ base bytestring deepseq ];
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -26151,8 +26250,8 @@ self: {
      }:
      mkDerivation {
        pname = "c2hs";
-       version = "0.22.1";
-       sha256 = "1dziid3xmhdz0sszs8nlilvjqj9qsd5nl6w3ckfbv5xqmywp9sap";
+       version = "0.23.1";
+       sha256 = "1vzng536z711hvv0ln40d863hwi103iywkhdsziy62nmxdq1afy5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -26438,9 +26537,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.22.0.0";
-       sha256 = "17cf2bkrxawjldhkq4hzlzlf7b2xqgkrzl7fa31whnnpni68v6jz";
-       editedCabalFile = "d7e8259a042ce1023f022e905792303290ad4860485748be4d1842627a604516";
+       version = "1.22.0.1";
+       sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27274,27 +27372,24 @@ self: {
      }) {};
 
   "call" = callPackage
-    ({ mkDerivation, base, bindings-portaudio, boundingboxes
-     , clean-unions, colors, containers, control-bool, deepseq
-     , directory, distributive, elevator, extensible, filepath
+    ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors
+     , containers, control-bool, deepseq, directory, filepath, free
      , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens
-     , linear, minioperational, mtl, objective, OpenGL, OpenGLRaw
-     , random, reflection, template-haskell, text, transformers, vector
-     , WAVE
+     , linear, mtl, objective, OpenGL, OpenGLRaw, random
+     , template-haskell, text, transformers, vector, WAVE
      }:
      mkDerivation {
        pname = "call";
-       version = "0.1.3";
-       sha256 = "11gk7wgkrid6k546ilcz3ik8cwclfss6hby1rgla9znyd5lqk7l9";
+       version = "0.1.4.1";
+       sha256 = "16g961vg6yhbj8k47idf3bhaabpqkd4db1y5k5729l08wg04048b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bindings-portaudio boundingboxes clean-unions colors
-         containers control-bool deepseq directory distributive elevator
-         extensible filepath freetype2 GLFW-b hashable JuicyPixels
-         JuicyPixels-util lens linear minioperational mtl objective OpenGL
-         OpenGLRaw random reflection template-haskell text transformers
-         vector WAVE
+         base bindings-portaudio boundingboxes colors containers
+         control-bool deepseq directory filepath free freetype2 GLFW-b
+         hashable JuicyPixels JuicyPixels-util lens linear mtl objective
+         OpenGL OpenGLRaw random template-haskell text transformers vector
+         WAVE
        ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/call";
@@ -27436,23 +27531,23 @@ self: {
 
   "caramia" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, gl
-     , HUnit, lens, linear, sdl2, semigroups, test-framework
+     , HUnit, lens, linear, mtl, sdl2, semigroups, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "caramia";
-       version = "0.7.1.1";
-       sha256 = "0xhfks6z4d308wkb6pnknn31nbpapnqc94n64yw450falhgy3k41";
+       version = "0.7.2.0";
+       sha256 = "0jndbw3xr5h9r0f8z4fplqxw02icfakr4j41yvfsw398yb94i8f0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring containers exceptions gl lens linear semigroups
+         base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
        ];
        testDepends = [
          base containers HUnit linear sdl2 test-framework
-         test-framework-hunit test-framework-quickcheck2
+         test-framework-hunit test-framework-quickcheck2 transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/Noeda/caramia/";
@@ -27534,15 +27629,15 @@ self: {
 
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, casadi, casadi-bindings-core
-     , casadi-bindings-internal, containers, linear, vector
+     , casadi-bindings-internal, cereal, containers, linear, vector
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.2.0.5";
-       sha256 = "0i3ly7zcy8qhgkid2zw982dmb6fh7b48q0qmc8fjj4yji6v1jka3";
+       version = "2.2.0.6";
+       sha256 = "1iasw1yvh5cm2b2lfhn7026rkil054fymal3n8p1kc0qm02zb4i5";
        buildDepends = [
-         base casadi-bindings-core casadi-bindings-internal containers
-         linear vector
+         base casadi-bindings-core casadi-bindings-internal cereal
+         containers linear vector
        ];
        pkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
@@ -28397,6 +28492,18 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "chalk" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "chalk";
+       version = "0.1.0.0";
+       sha256 = "09apxk27s6j8ciq3d2zxhr70ihm9s79zhc2pyg1xb220h6p55swk";
+       buildDepends = [ base ];
+       homepage = "http://github.com/joom/chalk";
+       description = "Terminal string styling";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "chalkboard" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Codec-Image-DevIL
      , containers, data-reify, directory, GLUT, OpenGLRaw, process, time
@@ -28658,6 +28765,7 @@ self: {
          aeson base blaze-html bytestring containers data-default http-types
          mtl syb text uniplate wai wai-extra xss-sanitize
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -30700,8 +30808,8 @@ self: {
     ({ mkDerivation, base, lens, linear, profunctors }:
      mkDerivation {
        pname = "colors";
-       version = "0.3.0.1";
-       sha256 = "0fnqcgix6d9y3yvkzakkw3xkqxbpqg1kffalxsr8g144qzvfbzax";
+       version = "0.3.0.2";
+       sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
        buildDepends = [ base lens linear profunctors ];
        homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
@@ -31717,22 +31825,23 @@ self: {
 
   "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
-     , conduit, directory, exceptions, filepath, hspec, monad-control
-     , network, primitive, process, resourcet, stm, streaming-commons
-     , text, transformers, transformers-base
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , hspec, monad-control, network, primitive, process, resourcet, stm
+     , streaming-commons, text, transformers, transformers-base
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.6.2";
-       sha256 = "1kk6pxmxd7vd97df98c42zssbahq42wh69v216mrqsslqqjgd1hc";
+       version = "1.1.7.0";
+       sha256 = "1q4iq9wmiazv743gdypqc9797z1c0gdk1lzyzvlk4811ka263508";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
          streaming-commons text transformers transformers-base
        ];
        testDepends = [
-         async attoparsec base blaze-builder bytestring conduit exceptions
-         hspec process resourcet stm text transformers transformers-base
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit exceptions hspec process resourcet stm streaming-commons
+         text transformers transformers-base
        ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
@@ -31859,7 +31968,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configurator" = callPackage
@@ -32052,8 +32160,8 @@ self: {
     ({ mkDerivation, base, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.1.0.0";
-       sha256 = "02vsadayxch5dl77jl4dpk36zj4wpkgrpwlad3swk8dyfqyf4jfk";
+       version = "0.2.0.0";
+       sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx";
        buildDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -32781,7 +32889,6 @@ self: {
        homepage = "https://github.com/relrod/copr-hs";
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core" = callPackage
@@ -33075,8 +33182,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.18.8";
-       sha256 = "085v3vhf15zscf5lhk0vi50jdm0kvq6z5l5rsz9j6bh8j47pi953";
+       version = "1.18.9";
+       sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory old-locale old-time polyparse ];
@@ -33519,8 +33626,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain1-constrained";
-       version = "0.3.1";
-       sha256 = "02ms8wjppyd23wzmyf8fcygy7gn13r431bz968nyrv8cdj2qiv3h";
+       version = "0.3.2";
+       sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
        buildDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
@@ -33557,13 +33664,12 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain2-tiers";
-       version = "0.2.3";
-       sha256 = "0dbg82ydsj7gl5bbfzldmkbv8q89ycsijpdrw7r9xrpac6b1428n";
+       version = "0.2.4";
+       sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
        buildDepends = [
          array base binary comonad containers data-lens logfloat monad-codec
          parallel sgd vector vector-binary vector-th-unbox
        ];
-       jailbreak = true;
        homepage = "https://github.com/kawu/crf-chain2-tiers";
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
@@ -36432,8 +36538,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.8.1";
-       sha256 = "1fbj0w5ybq3b3v0961389xzd4iyljfn9123djgl43xibk6xa9jk8";
+       version = "0.8.2";
+       sha256 = "031ibk22iyqzbkc6cy5ab5kmbhk68k5217szpw50vdp646rya21w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -37642,8 +37748,8 @@ self: {
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.8.0";
-       sha256 = "12hgidfvdqfi35abl66yz3sbsprq2ggnl22b0y85fsqd4bb5izrv";
+       version = "0.9.2";
+       sha256 = "1dkq3ab8ggbaz8ahk7iik1bhwnhzffmpr0dp0n2gvrm7lnas2s77";
        buildDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
@@ -38066,7 +38172,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-svg" = callPackage
@@ -38085,6 +38190,7 @@ self: {
          JuicyPixels lens monoid-extras mtl old-time process split time unix
          vector-space
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -38294,6 +38400,7 @@ self: {
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
        ];
+       jailbreak = true;
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38666,8 +38773,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "direct-murmur-hash";
-       version = "1.0";
-       sha256 = "1br1xi3pcv52pn3a51nnaxn1kvg5fg0z1ys11gamzkjjk60qxnmk";
+       version = "1.0.1";
+       sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
        buildDepends = [ base bytestring ];
        homepage = "http://ireneknapp.com/software/";
        description = "An implementation of the MurmurHash3 algorithm";
@@ -39151,7 +39258,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-platform";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -40459,8 +40565,8 @@ self: {
      }:
      mkDerivation {
        pname = "duplo";
-       version = "1.8.0";
-       sha256 = "0qza26n5zlzpif2fmwxajlfhk4kfqy5ad656xcw1i1926x5ncf1b";
+       version = "1.8.1";
+       sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40693,8 +40799,8 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "dynamic-mvector";
-       version = "0.1.0.1";
-       sha256 = "0yqw4ay18c3wmaw1ayqbxb0q2frnidb95nc41qpq6cj7m4pg5him";
+       version = "0.1.0.2";
+       sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn";
        buildDepends = [ base primitive vector ];
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
@@ -40729,8 +40835,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.1.0.0";
-       sha256 = "0v1q8f72hxpq8z7135p7714lljl2v7y7x1rwllyy2iwfikbiphwj";
+       version = "0.1.0.1";
+       sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31";
        buildDepends = [
          async base colour constrained-categories containers deepseq
          diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
@@ -41628,10 +41734,9 @@ self: {
     ({ mkDerivation, base, extensible, transformers }:
      mkDerivation {
        pname = "elevator";
-       version = "0.2.1";
-       sha256 = "0i79qxaknh39b5zjcknsdzrwzf9jxz8kjgzrzyw8x4bf2sgb5ak7";
+       version = "0.2.2";
+       sha256 = "1rnxvhyxgjb9ma680d713i0cqbsq0y8s1d57z2zx5qyq10jshcnm";
        buildDepends = [ base extensible transformers ];
-       jailbreak = true;
        homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
@@ -42778,7 +42883,6 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -42797,7 +42901,6 @@ self: {
        homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ert" = callPackage
@@ -43036,6 +43139,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "euler" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "euler";
+       version = "0.3.0";
+       sha256 = "0spxm1g2fpqjdz1k7zf1na2grs0x3yr1w60kv9ikznr5w1hfpbv4";
+       buildDepends = [ base ];
+       testDepends = [ base hspec ];
+       homepage = "https://github.com/decomputed/euler";
+       description = "Mathematics utilities for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "eurofxref" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, failure
      , hexpat, http-conduit, http-types, monad-control, mtl, time
@@ -44409,7 +44525,6 @@ self: {
        homepage = "https://github.com/relrod/fedora-packages-hs";
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed" = callPackage
@@ -44828,8 +44943,8 @@ self: {
      }:
      mkDerivation {
        pname = "file-embed";
-       version = "0.0.8";
-       sha256 = "0ghhmfwin339fg0b2zx08xq5pj7hzpy9gmbdlyql04p0n21vr360";
+       version = "0.0.8.1";
+       sha256 = "14ip9c3sqbpv580p402xxwjnylr1p9yqw8q9b5pg1481glwg3w0k";
        buildDepends = [
          base bytestring directory filepath template-haskell
        ];
@@ -45810,6 +45925,21 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "fltkhs" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, process }:
+     mkDerivation {
+       pname = "fltkhs";
+       version = "0.1.0.0";
+       sha256 = "1c8wdxxrx8y0911m3aa3b9svk7d3iqdsc2q0zrs67f0jv4wmd0dx";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base bytestring process ];
+       buildTools = [ c2hs ];
+       homepage = "http://github.com/deech/fltkhs";
+       description = "FLTK bindings";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, exceptions
@@ -45920,17 +46050,20 @@ self: {
      }) {};
 
   "foldl-incremental" = callPackage
-    ({ mkDerivation, base, bytestring, foldl, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, containers, deepseq, foldl
+     , histogram-fill, mwc-random, pipes, QuickCheck, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "foldl-incremental";
-       version = "0.1.1.0";
-       sha256 = "1wqvd48ivs4nn0kw9g9r0p0029kigl8bbc3554m1g033l2b8k2pk";
-       buildDepends = [ base foldl ];
+       version = "0.2.0.0";
+       sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk";
+       buildDepends = [
+         base containers deepseq foldl histogram-fill vector
+       ];
        testDepends = [
-         base bytestring foldl tasty tasty-golden tasty-hunit
-         tasty-quickcheck
+         base bytestring containers foldl histogram-fill mwc-random pipes
+         QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
        homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
@@ -46044,6 +46177,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "forbidden-fruit" = callPackage
+    ({ mkDerivation, base, control-monad-loop, hashable, hashtables
+     , hspec, primitive, transformers, transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "forbidden-fruit";
+       version = "0.1.0";
+       sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd";
+       buildDepends = [
+         base control-monad-loop hashable hashtables primitive transformers
+         transformers-base vector
+       ];
+       testDepends = [
+         base control-monad-loop hashable hashtables hspec primitive
+         transformers vector
+       ];
+       homepage = "http://github.com/minpou/forbidden-fruit";
+       description = "A library accelerates imperative style programming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "force-layout" = callPackage
     ({ mkDerivation, base, containers, data-default-class, lens
      , vector-space, vector-space-points
@@ -48272,23 +48426,22 @@ self: {
      }) {};
 
   "gf" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
-     , containers, directory, filepath, fst, happy, haskeline, HTF
-     , httpd-shed, HUnit, json, lifted-base, mtl, network, old-locale
-     , parallel, pretty, process, random, time, time-compat, unix
-     , utf8-string
+    ({ mkDerivation, alex, array, base, bytestring, Cabal, containers
+     , directory, filepath, fst, happy, haskeline, HTF, HUnit
+     , lifted-base, mtl, old-locale, parallel, pretty, process, random
+     , time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
        version = "3.6";
        sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx";
-       editedCabalFile = "d297db7ea916a307daa375bf1fb6119edacb403812dbcf031e453aa6dd1fd67a";
+       editedCabalFile = "ad294ebcd390005a243fe6d2203ec51f7ca2ab87a7f2fa7e7e080f0d416cb6a8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring cgi containers directory filepath fst
-         haskeline httpd-shed json lifted-base mtl network old-locale
-         parallel pretty process random time time-compat unix utf8-string
+         array base bytestring containers directory filepath fst haskeline
+         lifted-base mtl old-locale parallel pretty process random time
+         time-compat unix utf8-string
        ];
        testDepends = [ base Cabal directory filepath HTF HUnit process ];
        buildTools = [ alex happy ];
@@ -48526,8 +48679,8 @@ self: {
     ({ mkDerivation, base, process, shake, unordered-containers }:
      mkDerivation {
        pname = "ghc-make";
-       version = "0.3.1";
-       sha256 = "0nbv6sdi68ifbm4kz9h78n1aybc8rllyinc2k63m7lzh0jfqkk4m";
+       version = "0.3.2";
+       sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base process shake unordered-containers ];
@@ -49180,8 +49333,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-date";
-       version = "0.2.1";
-       sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l";
+       version = "0.2.2";
+       sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl";
        buildDepends = [ base bytestring time utf8-string ];
        testDepends = [
          base bytestring old-locale QuickCheck test-framework
@@ -49274,7 +49427,6 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-object" = callPackage
@@ -49400,6 +49552,7 @@ self: {
        homepage = "https://github.com/mattyhall/gitdo";
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github" = callPackage
@@ -49617,7 +49770,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -49700,25 +49852,23 @@ self: {
 
   "gitson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , doctest, errors, filepath, flock, Glob, hspec, HUnit
-     , monad-control, process, QuickCheck, transformers
+     , doctest, errors, filepath, flock, Glob, hspec, monad-control
+     , process, transformers
      }:
      mkDerivation {
        pname = "gitson";
-       version = "0.5.0";
-       sha256 = "0dx2wnyg331wzgv2wjp1h75xy0gc0zvfgzh8rakzg845srim1b8a";
+       version = "0.5.1";
+       sha256 = "175j2pkc3cb37h3vilb99i782as9yg68nacs2ysnp1m7hrxvvyjy";
        buildDepends = [
          aeson aeson-pretty base bytestring directory errors filepath flock
          monad-control process transformers
        ];
        testDepends = [
-         aeson base directory doctest Glob hspec HUnit process QuickCheck
-         transformers
+         aeson base directory doctest Glob hspec process transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/myfreeweb/gitson";
        description = "A document store library for Git + JSON";
-       license = stdenv.lib.licenses.asl20;
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -51418,21 +51568,20 @@ self: {
   "growler" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, either, http-types, lens, monad-control, mtl
-     , pipes, pipes-aeson, pipes-wai, regex-compat, text
+     , pipes, pipes-aeson, pipes-wai, regex-compat, text, transformers
      , transformers-base, unordered-containers, vector, wai, wai-extra
      , warp
      }:
      mkDerivation {
        pname = "growler";
-       version = "0.5.0.1";
-       sha256 = "1h0a64zcx9xinpgcjknrldnqrh614jc04fj14klgs1jsy43nf64n";
+       version = "0.6.0";
+       sha256 = "0skykz2p0kcs8g1vq7832h7fnw193hpq4pplkcaxazg8z97k8q75";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive either
          http-types lens monad-control mtl pipes pipes-aeson pipes-wai
-         regex-compat text transformers-base unordered-containers vector wai
-         wai-extra warp
+         regex-compat text transformers transformers-base
+         unordered-containers vector wai wai-extra warp
        ];
-       jailbreak = true;
        homepage = "http://github.com/iand675/growler";
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
        license = stdenv.lib.licenses.mit;
@@ -51566,7 +51715,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) gst_plugins_base;  inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -51643,7 +51791,6 @@ self: {
        testDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -51861,7 +52008,6 @@ self: {
        homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -53072,8 +53218,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "0.3.1.0";
-       sha256 = "1j081s9gpgwggaljf7xpgskdm4qzcqzd9p2yd76kg9ih4hhfvmw9";
+       version = "0.3.1.2";
+       sha256 = "0y7548x98zgmaqzgzaxrjs1zckkhzx4w7440ml3zfh2rv65frkkj";
        buildDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
@@ -53583,8 +53729,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.6.5.0";
-       sha256 = "04d2yrgybbkk7r9ql8w1zw45d59ng0922c0ylvbnj01az9i88kqi";
+       version = "4.6.6.0";
+       sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -53603,6 +53749,7 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -53963,16 +54110,16 @@ self: {
 
   "handsy" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, free
-     , process, process-extras, retry, shell-escape, tasty, tasty-hunit
-     , tasty-th, transformers
+     , process, process-extras, retry, shell-escape, split, tasty
+     , tasty-hunit, tasty-th, transformers
      }:
      mkDerivation {
        pname = "handsy";
-       version = "0.0.10";
-       sha256 = "16py1b72nbvh2wqmwcjwsf8yscrahc398zda92c781ah1qysykb5";
+       version = "0.0.11";
+       sha256 = "1zvz7zwj3ribz4b78082kwmlgp5aqcw6v1lw5klfx95rs009xw5w";
        buildDepends = [
          base bytestring data-default-class free process process-extras
-         retry shell-escape transformers
+         retry shell-escape split transformers
        ];
        testDepends = [ base bytestring tasty tasty-hunit tasty-th ];
        homepage = "https://github.com/utdemir/handsy";
@@ -54231,6 +54378,7 @@ self: {
          safecopy text time unordered-containers web-routes
          web-routes-happstack
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
@@ -54616,6 +54764,7 @@ self: {
          transformers transformers-base unix utf8-string xhtml zlib
        ];
        testDepends = [ base bytestring containers HUnit parsec zlib ];
+       jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -55578,8 +55727,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-docs";
-       version = "4.2.3";
-       sha256 = "0y42zwlmb75qdmixrwm63m27csiky92s4l54j7jjj2rmj51fz1af";
+       version = "4.2.4";
+       sha256 = "061gj5g1hga8k93rzknpyi51srlqnzcagykb9mzv91m8vp9wlnrf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -55716,7 +55865,6 @@ self: {
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { open-pal = null;  open-rte = null;  inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
@@ -57315,6 +57463,7 @@ self: {
          base blaze-html directory filepath HaTeX parsec text time
          transformers
        ];
+       jailbreak = true;
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57326,8 +57475,8 @@ self: {
      }:
      mkDerivation {
        pname = "hath";
-       version = "0.2.2";
-       sha256 = "12f1mij7yv8zd3v3l4jhh51harddp4angvvz5bc96y7mm16543ys";
+       version = "0.2.3";
+       sha256 = "17ijsy0fmvaqq4ql7c2788kk3pi975pbi1g7ijh5fj0ybgxk5dww";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -57456,18 +57605,17 @@ self: {
 
   "haxr" = callPackage
     ({ mkDerivation, array, base, base64-bytestring, blaze-builder
-     , bytestring, HaXml, HTTP, mtl, network, network-uri, old-locale
-     , old-time, template-haskell, time, utf8-string
+     , bytestring, HaXml, HTTP, mtl, mtl-compat, network, network-uri
+     , old-locale, old-time, template-haskell, time, utf8-string
      }:
      mkDerivation {
        pname = "haxr";
-       version = "3000.10.3.1";
-       sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm";
-       editedCabalFile = "911a81d122ae60328ff513ed2de6e055c051b03a5f88280f602da23e36111918";
+       version = "3000.10.4.2";
+       sha256 = "1v9sx73lwnamynsjf51pjr84v6qli9jcql5kf8d7af27bm54j0ry";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring HaXml HTTP
-         mtl network network-uri old-locale old-time template-haskell time
-         utf8-string
+         mtl mtl-compat network network-uri old-locale old-time
+         template-haskell time utf8-string
        ];
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
@@ -57495,7 +57643,7 @@ self: {
        pname = "haxy";
        version = "1.0";
        sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs";
-       editedCabalFile = "1e9eca705e28eed32d3fc2948dd5ca5402aec5bf13d256a6024939835e943585";
+       editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
        buildDepends = [
          base bytestring data-default-class hostname HTTP http-server mtl
          url
@@ -58422,6 +58570,7 @@ self: {
        pname = "heist";
        version = "0.14.1";
        sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
+       editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist errors filepath hashable
@@ -58559,7 +58708,6 @@ self: {
        ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellage" = callPackage
@@ -58696,19 +58844,19 @@ self: {
      , cipher-aes, conduit, deepseq, deepseq-generics, gtk, hidapi
      , hspec, HUnit, mtl, network-simple, optparse-applicative
      , pretty-show, robot, split, svgcairo, text, time, transformers
-     , vector, vector-fftw, websockets, xhb
+     , vector, vector-fftw, websockets
      }:
      mkDerivation {
        pname = "hemokit";
-       version = "0.6.4";
-       sha256 = "1ww013c0bb612yh2v968nvv7b3b1sv1r9ryrpsb670lwmds886g2";
+       version = "0.6.5";
+       sha256 = "104387q98qfhykmjkyhg08rji8pljlllp2j57ilhpb7ws9ik2g26";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base base64-bytestring bytestring cairo cipher-aes conduit
          deepseq deepseq-generics gtk hidapi mtl network-simple
          optparse-applicative pretty-show robot split svgcairo text time
-         transformers vector vector-fftw websockets xhb
+         transformers vector vector-fftw websockets
        ];
        testDepends = [ base bytestring hspec HUnit vector ];
        jailbreak = true;
@@ -58883,7 +59031,6 @@ self: {
        homepage = "https://github.com/gregwebs/haskell-heroku";
        description = "helpers for deploying to Heroku";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heroku-persistent" = callPackage
@@ -59087,8 +59234,8 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat";
-       version = "0.20.8";
-       sha256 = "0nz44cxigg91hix8h35bx0dk2l9pmn6jj1p5mvdh0cl7gvv6yf5s";
+       version = "0.20.9";
+       sha256 = "17cx8iafb07f2c8wmfmrfgpz9cjilciba6001klf42z039ghf72x";
        buildDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
@@ -59560,8 +59707,8 @@ self: {
      }:
      mkDerivation {
        pname = "hi";
-       version = "1.1.0.3";
-       sha256 = "1w9samqkgz47shr73rlscypawr1g3lnlwq2hg59iagfklw4hd5gz";
+       version = "1.2.0.0";
+       sha256 = "16c3j7pc87mxk9rgk98bicl9jhvnyj2d9spfjvhiknpsixb847h9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59779,6 +59926,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "highlighter2" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, filepath, mtl, pcre-light, text
+     }:
+     mkDerivation {
+       pname = "highlighter2";
+       version = "0.2.4";
+       sha256 = "1gl93z9vfpgqvxdqd8vsl13yz1yspxr6wfwqp4slnr8kpvm153fx";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base blaze-html blaze-markup bytestring containers filepath mtl
+         pcre-light text
+       ];
+       jailbreak = true;
+       description = "source code highlighting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "highlighting-kate" = callPackage
     ({ mkDerivation, base, blaze-html, containers, Diff, directory
      , filepath, mtl, parsec, process, regex-pcre, utf8-string
@@ -59796,6 +59962,7 @@ self: {
        testDepends = [
          base blaze-html containers Diff directory filepath process
        ];
+       jailbreak = true;
        prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
        homepage = "http://github.com/jgm/highlighting-kate";
        description = "Syntax highlighting";
@@ -59888,18 +60055,19 @@ self: {
      }) {};
 
   "hindent" = callPackage
-    ({ mkDerivation, base, data-default, descriptive, directory
-     , haskell-src-exts, hspec, monad-loops, mtl, text, transformers
+    ({ mkDerivation, applicative-quoters, base, data-default
+     , descriptive, directory, ghc-prim, haskell-src-exts, hspec
+     , monad-loops, mtl, text, transformers
      }:
      mkDerivation {
        pname = "hindent";
-       version = "4.3.11";
-       sha256 = "038x8gqa484n03q9x9n3xxl56cls31yff8546xr9vgyqmibiqxrg";
+       version = "4.3.12";
+       sha256 = "0qz9jpl6ha83yxh9wzqhzcxa9zc6f4f9z44srhm4jkqq07lh3api";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base data-default descriptive directory haskell-src-exts
-         monad-loops mtl text transformers
+         applicative-quoters base data-default descriptive directory
+         ghc-prim haskell-src-exts monad-loops mtl text transformers
        ];
        testDepends = [
          base data-default directory haskell-src-exts hspec monad-loops mtl
@@ -60456,6 +60624,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hjsonpointer" = callPackage
+    ({ mkDerivation, aeson, base, http-types, HUnit, test-framework
+     , test-framework-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "0.1.0.1";
+       sha256 = "03c0hl4hzgihkqla7kqkjk5s1k68pnblqpisjrzf4bzjl8z1z6hw";
+       buildDepends = [ aeson base text unordered-containers vector ];
+       testDepends = [
+         aeson base http-types HUnit test-framework test-framework-hunit
+         text unordered-containers vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , hashable, HUnit, lens, regexpr, scientific, test-framework
@@ -62222,7 +62408,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hosc";
        description = "Haskell Open Sound Control";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hosc-json" = callPackage
@@ -64249,7 +64434,6 @@ self: {
        homepage = "https://github.com/tmhedberg/hsenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hserv" = callPackage
@@ -65186,7 +65370,6 @@ self: {
        testDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-wai" = callPackage
@@ -65944,6 +66127,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "html-email-validate" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, QuickCheck
+     , regex-pcre-builtin, text, text-show
+     }:
+     mkDerivation {
+       pname = "html-email-validate";
+       version = "0.1.0.0";
+       sha256 = "076xiv1r9yzaxr84v211kib6xy9aggal0vgyz565vgwqpfm2hif4";
+       buildDepends = [ attoparsec base text text-show ];
+       testDepends = [
+         attoparsec base hspec QuickCheck regex-pcre-builtin text
+       ];
+       description = "Validating an email address against HTML standard";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "html-kure" = callPackage
     ({ mkDerivation, base, hxt, kure }:
      mkDerivation {
@@ -66014,19 +66213,14 @@ self: {
      }) {};
 
   "html5-entity" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, haskell-src
-     , text, unordered-containers
-     }:
+    ({ mkDerivation, base, containers, text }:
      mkDerivation {
        pname = "html5-entity";
-       version = "0.1.0.1";
-       sha256 = "1mad38pq2cdxkgr8qa3g7pznavgsxlp4bxv77yhbrh75rns8n7id";
+       version = "0.2.0.2";
+       sha256 = "1vy47b9k71jjrrhgakq9hla67cf006fvj6ggqxq14b0a1bclfkf7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring containers haskell-src text
-         unordered-containers
-       ];
+       buildDepends = [ base containers text ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
@@ -66529,8 +66723,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.5.1";
-       sha256 = "0jfnbmdpagpw882a9gnf8pp9b63pm6w20xb2w6yv6h4ljvl6f07c";
+       version = "0.6.0";
+       sha256 = "05vjlfa4z5g84y2vq9c4dhasjl8w55n0si0iy3fkl980jkx59771";
        buildDepends = [ base bytestring case-insensitive containers ];
        testDepends = [
          base bytestring Cabal cabal-test-quickcheck case-insensitive
@@ -66634,8 +66828,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-server";
-       version = "1.0.5";
-       sha256 = "1mbdla50sxdi7fs1l2wrk42nyrb4s9ls86x695jch4zwg06q0gx3";
+       version = "1.0.6";
+       sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w";
        buildDepends = [
          base HTTP mime network network-uri text unix url utf8-string
        ];
@@ -66688,7 +66882,6 @@ self: {
        homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -66876,8 +67069,8 @@ self: {
      }:
      mkDerivation {
        pname = "hub";
-       version = "1.4.0";
-       sha256 = "1720gcn6d3j0i2j317savgd57n81330pjdsnlymsdg12704xs59i";
+       version = "1.9.0.1";
+       sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -67207,8 +67400,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwsl2";
-       version = "0.1.1.4";
-       sha256 = "121p95h7pzd9rpwwijym65g7a55ys12nz3gqinwh4jsdpr67xqkc";
+       version = "0.2.0.0";
+       sha256 = "0cyc4y99ird4mxpasrbk82x7xl63r7cc710qisvm8qvjlmriw87b";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
@@ -68489,7 +68682,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -68535,7 +68727,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -68645,6 +68836,7 @@ self: {
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
+       jailbreak = true;
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70174,7 +70366,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc" = callPackage
@@ -70379,7 +70570,6 @@ self: {
        buildDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "islink" = callPackage
@@ -71480,7 +71670,7 @@ self: {
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, byteable
+    ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring, byteable
      , bytestring, cereal, cipher-aes, containers, cprng-aes
      , crypto-cipher-types, crypto-numbers, crypto-pubkey
      , crypto-pubkey-types, crypto-random, cryptohash, doctest, either
@@ -71489,8 +71679,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.3.1";
-       sha256 = "0s57xks5fp0hvi52kyfcb06pyf31424pa63y2n73qprf0gbm6chb";
+       version = "0.4.1";
+       sha256 = "0j4f0w2v1fwfiylvlwk9l0646wnmjcz36faw9h76j4brzsj0dc23";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
@@ -71498,9 +71688,10 @@ self: {
          unordered-containers vector
        ];
        testDepends = [
-         aeson base base64-bytestring bytestring cipher-aes cprng-aes
-         crypto-cipher-types crypto-pubkey crypto-random cryptohash doctest
-         either hspec HUnit mtl QuickCheck text
+         aeson aeson-qq base base64-bytestring bytestring cipher-aes
+         cprng-aes crypto-cipher-types crypto-pubkey crypto-pubkey-types
+         crypto-random cryptohash doctest either hspec HUnit mtl QuickCheck
+         text
        ];
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
@@ -72338,7 +72529,6 @@ self: {
        homepage = "https://github.com/fumieval/karakuri";
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karver" = callPackage
@@ -73269,33 +73459,21 @@ self: {
      }) {};
 
   "lambdabot" = callPackage
-    ({ mkDerivation, array, arrows, base, binary, brainfuck, bytestring
-     , containers, data-memocombinators, dependent-map, dependent-sum
-     , dependent-sum-template, dice, directory, edit-distance, filepath
-     , haskeline, haskell-src-exts, hoogle, hslogger, hstatsd, HTTP
-     , IOSpec, lifted-base, logict, misfortune, monad-control
-     , MonadRandom, mtl, mueval, network, numbers, oeis, parsec, pretty
-     , process, QuickCheck, random, random-fu, random-source, regex-tdfa
-     , SafeSemaphore, show, split, syb, tagsoup, template-haskell, time
-     , transformers, transformers-base, unix, unlambda, utf8-string
-     , vector-space, zlib
+    ({ mkDerivation, base, lambdabot-core, lambdabot-haskell-plugins
+     , lambdabot-irc-plugins, lambdabot-misc-plugins
+     , lambdabot-novelty-plugins, lambdabot-reference-plugins
+     , lambdabot-social-plugins
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "4.3.0.1";
-       sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb";
-       isLibrary = true;
+       version = "5.0";
+       sha256 = "022xrcpjxzs7ac4ssaq1xkmjypvql8bpa1mvmgysskg6z0ix7jr9";
+       isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array arrows base binary brainfuck bytestring containers
-         data-memocombinators dependent-map dependent-sum
-         dependent-sum-template dice directory edit-distance filepath
-         haskeline haskell-src-exts hoogle hslogger hstatsd HTTP IOSpec
-         lifted-base logict misfortune monad-control MonadRandom mtl mueval
-         network numbers oeis parsec pretty process QuickCheck random
-         random-fu random-source regex-tdfa SafeSemaphore show split syb
-         tagsoup template-haskell time transformers transformers-base unix
-         unlambda utf8-string vector-space zlib
+         base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins
+         lambdabot-misc-plugins lambdabot-novelty-plugins
+         lambdabot-reference-plugins lambdabot-social-plugins
        ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
@@ -73303,6 +73481,164 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdabot-core" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , dependent-map, dependent-sum, dependent-sum-template, directory
+     , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base
+     , monad-control, mtl, network, parsec, random, random-fu
+     , random-source, regex-tdfa, SafeSemaphore, split, template-haskell
+     , time, transformers, transformers-base, unix, utf8-string, zlib
+     }:
+     mkDerivation {
+       pname = "lambdabot-core";
+       version = "5.0";
+       sha256 = "0krsz6a7lgclbwnjy3581lqzcb3y6gf8fav6n7ka5683mp281xa5";
+       buildDepends = [
+         base binary bytestring containers dependent-map dependent-sum
+         dependent-sum-template directory edit-distance filepath haskeline
+         hslogger HTTP lifted-base monad-control mtl network parsec random
+         random-fu random-source regex-tdfa SafeSemaphore split
+         template-haskell time transformers transformers-base unix
+         utf8-string zlib
+       ];
+       jailbreak = true;
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Lambdabot core functionality";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-haskell-plugins" = callPackage
+    ({ mkDerivation, array, arrows, base, bytestring, containers
+     , data-memocombinators, directory, filepath, haskell-src-exts
+     , hoogle, HTTP, IOSpec, lambdabot-core, lambdabot-reference-plugins
+     , lambdabot-trusted, lifted-base, logict, MonadRandom, mtl, mueval
+     , network, numbers, oeis, parsec, pretty, process, QuickCheck
+     , regex-tdfa, show, split, syb, transformers, utf8-string
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "lambdabot-haskell-plugins";
+       version = "5.0";
+       sha256 = "1ls34bqyqxf89dgfcn1frsz6bdxy10dbyk7f7c9lndks8sv8hlvr";
+       buildDepends = [
+         array arrows base bytestring containers data-memocombinators
+         directory filepath haskell-src-exts hoogle HTTP IOSpec
+         lambdabot-core lambdabot-reference-plugins lambdabot-trusted
+         lifted-base logict MonadRandom mtl mueval network numbers oeis
+         parsec pretty process QuickCheck regex-tdfa show split syb
+         transformers utf8-string vector-space
+       ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Lambdabot Haskell plugins";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-irc-plugins" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , lambdabot-core, lifted-base, mtl, network, SafeSemaphore, split
+     , time
+     }:
+     mkDerivation {
+       pname = "lambdabot-irc-plugins";
+       version = "5.0";
+       sha256 = "0d0pm06912rc4xwmqrwcwyfnzwmazqc0sdp58nqdpzk4wg5f3lx2";
+       buildDepends = [
+         base bytestring containers directory filepath lambdabot-core
+         lifted-base mtl network SafeSemaphore split time
+       ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "IRC plugins for lambdabot";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-misc-plugins" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, hstatsd
+     , lambdabot-core, lifted-base, monad-control, mtl, network
+     , network-uri, parsec, process, random, random-fu, random-source
+     , regex-tdfa, SafeSemaphore, split, tagsoup, template-haskell, time
+     , transformers, transformers-base, unix, utf8-string, zlib
+     }:
+     mkDerivation {
+       pname = "lambdabot-misc-plugins";
+       version = "5.0";
+       sha256 = "0i9ax50vxfj312kw8lgxdnqsiriip2ls6zaq3c7ll4f1x6cb634r";
+       buildDepends = [
+         base bytestring containers filepath hstatsd lambdabot-core
+         lifted-base monad-control mtl network network-uri parsec process
+         random random-fu random-source regex-tdfa SafeSemaphore split
+         tagsoup template-haskell time transformers transformers-base unix
+         utf8-string zlib
+       ];
+       jailbreak = true;
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Lambdabot miscellaneous plugins";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-novelty-plugins" = callPackage
+    ({ mkDerivation, base, binary, brainfuck, bytestring, containers
+     , dice, directory, lambdabot-core, misfortune, process, random-fu
+     , regex-tdfa, unlambda
+     }:
+     mkDerivation {
+       pname = "lambdabot-novelty-plugins";
+       version = "5.0";
+       sha256 = "0nsagim2jzpap2ja7661qycvy0nqrnjq6hx6d8zvisql7g70yji0";
+       buildDepends = [
+         base binary brainfuck bytestring containers dice directory
+         lambdabot-core misfortune process random-fu regex-tdfa unlambda
+       ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Novelty plugins for Lambdabot";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-reference-plugins" = callPackage
+    ({ mkDerivation, base, bytestring, containers, HTTP, lambdabot-core
+     , mtl, network, network-uri, oeis, process, regex-tdfa, split
+     , tagsoup, utf8-string
+     }:
+     mkDerivation {
+       pname = "lambdabot-reference-plugins";
+       version = "5.0";
+       sha256 = "017zw98mw3mcrxgl489zyfjq605m07wkjs5kcwcjf7071vh358c7";
+       buildDepends = [
+         base bytestring containers HTTP lambdabot-core mtl network
+         network-uri oeis process regex-tdfa split tagsoup utf8-string
+       ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Lambdabot reference plugins";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-social-plugins" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , lambdabot-core, mtl, split, time
+     }:
+     mkDerivation {
+       pname = "lambdabot-social-plugins";
+       version = "5.0";
+       sha256 = "0c5p8pxng6nwn252mi92yrwq67pdrykjmpkkbvw9ajwhg8v5nf08";
+       buildDepends = [
+         base binary bytestring containers lambdabot-core mtl split time
+       ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Social plugins for Lambdabot";
+       license = "GPL";
+     }) {};
+
+  "lambdabot-trusted" = callPackage
+    ({ mkDerivation, base, oeis, QuickCheck }:
+     mkDerivation {
+       pname = "lambdabot-trusted";
+       version = "5.0";
+       sha256 = "09cz4vr4pxsa25ms336ic80lsqm4d5lrfvra194h5h2hddvhdk5q";
+       buildDepends = [ base oeis QuickCheck ];
+       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       description = "Lambdabot trusted code";
+       license = "GPL";
+     }) {};
+
   "lambdabot-utils" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, haskell-src
      , mtl, network, old-time, process, random, regex-compat
@@ -73952,18 +74288,20 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, array, base, deepseq, directory, filepath, mtl
-     , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, alex, array, base, deepseq, directory, filepath
+     , mtl, parsec, QuickCheck, safe, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.6.3";
-       sha256 = "0x7fafp78ipk4r2l2iagk7xgpbq5gwnqs33d4r4hk7k89jgjkv6c";
+       version = "0.6.3.1";
+       sha256 = "11q59pbl7bjx4x8xn07lq09a235l1sgw510s9lb89q35mm0mravi";
        buildDepends = [ array base deepseq mtl parsec safe ];
        testDepends = [
          base deepseq directory filepath parsec QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
+       buildTools = [ alex ];
        homepage = "http://github.com/osa1/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -74447,7 +74785,6 @@ self: {
        buildDepends = [ array base ];
        description = "L-BFGS optimization";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lca" = callPackage
@@ -74624,8 +74961,8 @@ self: {
      }:
      mkDerivation {
        pname = "learning-hmm";
-       version = "0.3.1.0";
-       sha256 = "12sfx2dmlv290ycy29nxjrxsl55q0qhyrcfn0z2nwmx0gvprpgyh";
+       version = "0.3.1.1";
+       sha256 = "1ry8g3gkmvj5xk4llrll40g8xdddg8g2rbg8qwjwqpdd1ni9hck4";
        buildDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
@@ -74848,10 +75185,9 @@ self: {
     ({ mkDerivation, base, lens, QuickCheck, transformers }:
      mkDerivation {
        pname = "lens-properties";
-       version = "4.0";
-       sha256 = "07hjkcy90m1zph2bq5a7nw2f7xg0ndnkqml9zwh7vy35sb7512c6";
+       version = "4.7";
+       sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik";
        buildDepends = [ base lens QuickCheck transformers ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -75011,6 +75347,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lexer-applicative" = callPackage
+    ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "lexer-applicative";
+       version = "1.0.0.1";
+       sha256 = "14srsxw3xyhllmxlxkfid1njay5dca4zy488sa1lmsffrfdkp20z";
+       buildDepends = [ base regex-applicative srcloc ];
+       testDepends = [
+         base deepseq regex-applicative srcloc tasty tasty-hunit
+       ];
+       homepage = "https://github.com/feuerbach/lexer-applicative";
+       description = "Simple lexer based on applicative regular expressions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lgtk" = callPackage
     ({ mkDerivation, array, base, cairo, colour, containers
      , diagrams-cairo, diagrams-lib, directory, filepath, fsnotify
@@ -75068,7 +75421,6 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae";
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhc" = callPackage
@@ -75095,7 +75447,6 @@ self: {
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhe" = callPackage
@@ -75994,12 +76345,11 @@ self: {
      }:
      mkDerivation {
        pname = "linear-opengl";
-       version = "0.2.0.5";
-       sha256 = "17njj6r6k31da254wa6q84x80rz9rwbdmmk9yi27d7zjmdczv94s";
+       version = "0.2.0.6";
+       sha256 = "1yb6c0r10d44pyahhzgyajphgyhmr9hs402633k6ynm3f1jdwyyg";
        buildDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -76046,7 +76396,6 @@ self: {
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linearscan-hoopl" = callPackage
@@ -76631,6 +76980,7 @@ self: {
          base blaze-html blaze-markup cheapskate directory filepath
          highlighting-kate parsec text time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/cdosborn/lit";
        description = "A simple tool for literate programming";
        license = "GPL";
@@ -77195,7 +77545,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Michael and Scott lock-free queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-domain" = callPackage
@@ -77764,7 +78113,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltl" = callPackage
@@ -77847,16 +78195,16 @@ self: {
 
   "lucid" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, hspec, HUnit, mtl, parsec, text, transformers
-     , unordered-containers
+     , containers, hashable, hspec, HUnit, mtl, parsec, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "lucid";
-       version = "2.9.1";
-       sha256 = "0zb8zng5pilr8jcnn0vi0qlngv93p322xnkrypkr1sa5ywd7n9j0";
+       version = "2.9.2";
+       sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah";
        buildDepends = [
-         base blaze-builder bytestring containers mtl text transformers
-         unordered-containers
+         base blaze-builder bytestring containers hashable mtl text
+         transformers unordered-containers
        ];
        testDepends = [ base bifunctors hspec HUnit mtl parsec text ];
        homepage = "https://github.com/chrisdone/lucid";
@@ -77882,8 +78230,8 @@ self: {
     ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
        pname = "lucid-svg";
-       version = "0.4.0.2";
-       sha256 = "1zdndb81190xg2zwpw10pg0qpjvyp2jmvwm64s2bid3shlhibmmd";
+       version = "0.4.0.3";
+       sha256 = "0fr8f641rkazi4ff5s0gr72v5chd2f7dl600v8rj4fp2vmxwwhjc";
        buildDepends = [ base blaze-builder lucid text transformers ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
@@ -78442,10 +78790,9 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.2.7";
-       sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
+       version = "0.2.7.1";
+       sha256 = "1ac7rig4hc7i3qv7j45442j0d7zhvlwg41a14wykr3fsi8vb1n5m";
        buildDepends = [ base containers srcloc text ];
-       jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
@@ -79011,16 +79358,17 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , MonadRandom, random, semigroups, transformers, vector
-     , vector-algorithms, vector-space, void
+     , MemoTrie, MonadRandom, random, semigroups, tagged, transformers
+     , vector, vector-algorithms, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.0.0";
-       sha256 = "1lbgkjhbfsps882vc2l97gwg92gh668kkhdwpy7rldbj7a9bdnzq";
+       version = "0.1.0.2";
+       sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14";
        buildDepends = [
-         base comonad constrained-categories containers MonadRandom random
-         semigroups transformers vector vector-algorithms vector-space void
+         base comonad constrained-categories containers MemoTrie MonadRandom
+         random semigroups tagged transformers vector vector-algorithms
+         vector-space void
        ];
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
@@ -80187,15 +80535,15 @@ self: {
      }) {};
 
   "microformats2-types" = callPackage
-    ({ mkDerivation, aeson, base, data-default, either, pandoc-types
+    ({ mkDerivation, aeson, base, data-default-class, pandoc-types
      , setters, text, time
      }:
      mkDerivation {
        pname = "microformats2-types";
-       version = "0.3.0";
-       sha256 = "0wldwc9l6r2h63h22ymj62x17vcwqwswzqwcfs1nm81nrh2rj07a";
+       version = "0.4.0";
+       sha256 = "020193sbvg5arha9pvbc88wqrqyvshy19kz02knkh5kv0dzqngf6";
        buildDepends = [
-         aeson base data-default either pandoc-types setters text time
+         aeson base data-default-class pandoc-types setters text time
        ];
        homepage = "https://github.com/myfreeweb/microformats2-types";
        description = "Microformats 2 types (with Aeson instances)";
@@ -80279,7 +80627,6 @@ self: {
        homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midisurface" = callPackage
@@ -80379,18 +80726,17 @@ self: {
   "milena" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest
      , either, hspec, lens, mtl, network, QuickCheck, random
-     , transformers
+     , resource-pool, transformers
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.1.0.0";
-       sha256 = "1ajd92pvzqkca9bg5labw40iafzc7fdjahf8jhhccgvayasdlk3r";
+       version = "0.2.0.0";
+       sha256 = "08nfjd1jn9cniksj8zrifaz3fjgnhzgydlswbz2h4lqv9kyqvvrm";
        buildDepends = [
          base bytestring cereal containers digest either lens mtl network
-         random transformers
+         random resource-pool transformers
        ];
        testDepends = [ base bytestring hspec network QuickCheck ];
-       jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81324,8 +81670,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.12";
-       sha256 = "0n5y2rc7da4paszcnvi6yrzg8fmi2nzyxd62d554z7fwciv9px71";
+       version = "0.3.13";
+       sha256 = "00gzv4yfh3xj95nl6jyqc0d7m8n98inbmkxinq66ny9159qry0jg";
        buildDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -82054,8 +82400,8 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.9.0";
-       sha256 = "1iw475jkm6szl82z9y7535c6ifzbg2faixryx39gv1mhg898brmm";
+       version = "0.9.0.1";
+       sha256 = "1wcl2cv16855kg9kn3cz3947jzcb3g2n3mqnhkp0spd42ya3jw83";
        buildDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -82371,9 +82717,8 @@ self: {
      }:
      mkDerivation {
        pname = "mp";
-       version = "0.1.3";
-       sha256 = "0gh2xsn9nmb8r8l69xcdd0v9ldk8663676wl5dxh6300h97a0dsj";
-       editedCabalFile = "155358da276e8dee3d6e543f005025de03692dc9857d74cd19291a0b98ece325";
+       version = "0.2.2";
+       sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -84687,17 +85032,21 @@ self: {
      }) {};
 
   "network-attoparsec" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec
-     , mtl, network, network-simple
+    ({ mkDerivation, attoparsec, base, bytestring, enclosed-exceptions
+     , exceptions, hspec, lifted-base, monad-control, mtl, network
+     , network-simple, transformers
      }:
      mkDerivation {
        pname = "network-attoparsec";
-       version = "0.9.2";
-       sha256 = "02f5fl5ylcz68ijvjbmx864j7nr45vxjscvslqn2gyh328zqq8dy";
-       buildDepends = [ attoparsec base bytestring mtl network ];
+       version = "0.11.2";
+       sha256 = "15ibasfam8c3gsq8szj6qpwf1gvcgdh3jq0a669dqh0mddx2a97v";
+       buildDepends = [
+         attoparsec base bytestring enclosed-exceptions exceptions
+         lifted-base monad-control mtl network transformers
+       ];
        testDepends = [
          attoparsec base bytestring exceptions hspec mtl network
-         network-simple
+         network-simple transformers
        ];
        homepage = "http://github.com/solatis/haskell-network-attoparsec";
        description = "Utility functions for running a parser against a socket";
@@ -86380,14 +86729,15 @@ self: {
 
   "objective" = callPackage
     ({ mkDerivation, base, containers, either, free, hashable
-     , profunctors, transformers, unordered-containers, void, witherable
+     , profunctors, stm, transformers, unordered-containers, void
+     , witherable
      }:
      mkDerivation {
        pname = "objective";
-       version = "1";
-       sha256 = "1gpz3cpdhnbjfzyqix8bwzfba9lbsa6y0qjbzzrlahmw8i373c6f";
+       version = "1.0.1";
+       sha256 = "1jycikj070mkrw43h44ynvh2f73n1p2ajxyxy7r0a57hl9l6rwba";
        buildDepends = [
-         base containers either free hashable profunctors transformers
+         base containers either free hashable profunctors stm transformers
          unordered-containers void witherable
        ];
        homepage = "https://github.com/fumieval/objective";
@@ -86679,8 +87029,8 @@ self: {
      }:
      mkDerivation {
        pname = "on-demand-ssh-tunnel";
-       version = "0.1.0.5";
-       sha256 = "0gsfdsss7yddb90rx0ml6lpcd5q0qvk78m42iz1ikqgy5g9hgv1x";
+       version = "0.1.0.6";
+       sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -87537,8 +87887,8 @@ self: {
      }:
      mkDerivation {
        pname = "origami";
-       version = "0.0.1";
-       sha256 = "05ib0nmv9pl158kl4gplqwhdx3mbi41kziika5kpyddlbg33y1n7";
+       version = "0.0.2";
+       sha256 = "1fmr12y5dma4w8psxpnx8rk0yixm46gc8mjbdi5l8qxrkxlmnr2s";
        buildDepends = [
          base bifunctors containers lens mtl pretty template-haskell
        ];
@@ -87654,6 +88004,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pack" = callPackage
+    ({ mkDerivation, array, base, bytestring, lens, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pack";
+       version = "0.4.0";
+       sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9";
+       buildDepends = [ array base bytestring lens transformers vector ];
+       homepage = "https://github.com/capsjac/pack";
+       description = "Bidirectional fast ByteString packer/unpacker";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "package-o-tron" = callPackage
     ({ mkDerivation, base, Cabal, filemanip, filepath, groom, packdeps
      , process
@@ -87808,7 +88172,6 @@ self: {
        homepage = "https://github.com/fumieval/padKONTROL";
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagerduty" = callPackage
@@ -87931,6 +88294,7 @@ self: {
          test-framework-quickcheck2 text zip-archive
        ];
        configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
+       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -89015,8 +89379,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcre-heavy";
-       version = "0.2.1";
-       sha256 = "1jaz871g794xqxal3xa6ikl6cdn2hnw4qbrd8rlmlcrd8p3hcrjm";
+       version = "0.2.2";
+       sha256 = "08cv6vmf5qpjky8zfrz3c5cczn5vrf30p5masyb3m625wm2sjjw3";
        buildDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
@@ -89175,8 +89539,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdfinfo";
-       version = "1.5.1";
-       sha256 = "1xhznh9pqx4yvzfnypjkmgrsv5z1949vnrix101y6iy0y1zk4r5x";
+       version = "1.5.2";
+       sha256 = "1s2hhmcqsg57fppqjvrkp77bms1npblysjvfl37fgn0jafn0mhjq";
        buildDepends = [ base mtl old-locale process-extras text time ];
        homepage = "https://github.com/chrisdone/pdfinfo";
        description = "Wrapper around the pdfinfo command";
@@ -89536,8 +89900,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.1.4";
-       sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
+       version = "2.1.1.6";
+       sha256 = "1jz77x8ikplp5v866x73iii49g2r28dj1xg7gv1c1ypqsz14scsr";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -90222,20 +90586,22 @@ self: {
 
   "picoparsec" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , monoid-subclasses, QuickCheck, quickcheck-instances, scientific
-     , tasty, tasty-quickcheck, text
+     , monoid-subclasses, QuickCheck, quickcheck-instances
+     , quickcheck-unicode, scientific, tasty, tasty-quickcheck, text
+     , vector
      }:
      mkDerivation {
        pname = "picoparsec";
-       version = "0.1";
-       sha256 = "024j1iivy5vhpygn3bz48lrn06p84ncmax3p1g76xnszffklk6fh";
+       version = "0.1.1";
+       sha256 = "1b2dxms5bdiz2cci488cnar65jwv6mknhnm3qcff49ax4y9w8gi2";
        buildDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
        ];
        testDepends = [
-         base bytestring monoid-subclasses QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text
+         array base bytestring deepseq monoid-subclasses QuickCheck
+         quickcheck-instances quickcheck-unicode scientific tasty
+         tasty-quickcheck text vector
        ];
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
@@ -90696,10 +91062,9 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-safe";
-       version = "2.2.1";
-       sha256 = "0f1k2dbkm9my8kljzy72v0ag9bjkkm63lxi148nrpr9xv5f12kcj";
+       version = "2.2.2";
+       sha256 = "1sp0fw5w4kcf5llxx2qqzx8n5ps8qw1jx5asqg7al89mqr38am05";
        buildDepends = [ base containers exceptions pipes transformers ];
-       jailbreak = true;
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91031,7 +91396,6 @@ self: {
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-lab" = callPackage
@@ -93053,6 +93417,7 @@ self: {
          multiset QuickCheck quickcheck-instances template-haskell text
          transformers
        ];
+       jailbreak = true;
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94093,19 +94458,19 @@ self: {
 
   "purescript" = callPackage
     ({ mkDerivation, base, containers, directory, file-embed, filepath
-     , haskeline, monad-unify, mtl, nodejs, optparse-applicative, parsec
+     , haskeline, mtl, nodejs, optparse-applicative, parsec
      , pattern-arrows, process, time, transformers, unordered-containers
      , utf8-string
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.6.7.1";
-       sha256 = "0i7y5hxzhryvqgbd2gghf0cr9m6x1gh9snbbd9x4742hkipigx4s";
+       version = "0.6.8";
+       sha256 = "02bcy8qfcsaxz0ygcajskj9dmpyl291vgvjp0jlrjsfcv8ym4izl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers directory file-embed filepath haskeline monad-unify
-         mtl optparse-applicative parsec pattern-arrows process time
+         base containers directory file-embed filepath haskeline mtl
+         optparse-applicative parsec pattern-arrows process time
          transformers unordered-containers utf8-string
        ];
        testDepends = [
@@ -95831,7 +96196,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -96448,6 +96812,7 @@ self: {
        version = "0.2.3";
        sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5";
        buildDepends = [ base blaze-html blaze-markup reform text ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using blaze-html with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -96460,6 +96825,7 @@ self: {
        version = "0.0.4";
        sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg";
        buildDepends = [ base blaze-markup reform shakespeare text ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -97322,7 +97688,6 @@ self: {
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remotion" = callPackage
@@ -97916,44 +98281,49 @@ self: {
 
   "rest-client" = callPackage
     ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
-     , data-default, exception-transformers, http-conduit, http-types
-     , hxt, hxt-pickle-utils, monad-control, mtl, primitive, resourcet
-     , rest-types, tostring, transformers-base, uri-encode, utf8-string
+     , data-default, exceptions, http-conduit, http-types, hxt
+     , hxt-pickle-utils, monad-control, mtl, primitive, resourcet
+     , rest-types, tostring, transformers, transformers-base
+     , transformers-compat, uri-encode, utf8-string
      }:
      mkDerivation {
        pname = "rest-client";
-       version = "0.4.0.5";
-       sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
+       version = "0.5.0.0";
+       sha256 = "0clhqp78i6823sxfj5xahajg450s15qqf7l2kc9dpfirz49xxpva";
        buildDepends = [
          aeson-utils base bytestring case-insensitive data-default
-         exception-transformers http-conduit http-types hxt hxt-pickle-utils
+         exceptions http-conduit http-types hxt hxt-pickle-utils
          monad-control mtl primitive resourcet rest-types tostring
-         transformers-base uri-encode utf8-string
+         transformers transformers-base transformers-compat uri-encode
+         utf8-string
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rest-core" = callPackage
-    ({ mkDerivation, aeson, aeson-utils, base, bytestring, either
-     , errors, fclabels, HUnit, hxt, hxt-pickle-utils, json-schema, mtl
-     , multipart, random, rest-stringmap, rest-types, safe, split
+    ({ mkDerivation, aeson, aeson-utils, base, bytestring
+     , case-insensitive, either, errors, fclabels, HUnit, hxt
+     , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random
+     , rest-stringmap, rest-types, safe, semigroups, split
      , test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, uri-encode, utf8-string, uuid
+     , transformers-compat, unordered-containers, uri-encode
+     , utf8-string, uuid
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.34.0.3";
-       sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19";
+       version = "0.35";
+       sha256 = "1ykfni3jn31hgk2s1028r6am3bnf3nwndkd39in70q9sjjzmfr25";
        buildDepends = [
-         aeson aeson-utils base bytestring either errors fclabels hxt
-         hxt-pickle-utils json-schema mtl multipart random rest-stringmap
-         rest-types safe split text transformers unordered-containers
-         uri-encode utf8-string uuid
+         aeson aeson-utils base bytestring case-insensitive either errors
+         fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart
+         random rest-stringmap rest-types safe semigroups split text
+         transformers transformers-compat unordered-containers uri-encode
+         utf8-string uuid
        ];
        testDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit
-         unordered-containers
+         transformers transformers-compat unordered-containers
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
@@ -97976,6 +98346,7 @@ self: {
          regular regular-xmlpickler rest-core rest-gen safe stm text time
          transformers transformers-base unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
@@ -97991,8 +98362,9 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.16.1.8";
-       sha256 = "0wwxx5a5s4b7j1qbcphprdpba2jy8qx449mq4k4qmz55xzacii2v";
+       version = "0.17.0.0";
+       sha256 = "1z0227d43dj3c1yh74lh71qihggj21pl7i6mwarb6kam2ziwp7mk";
+       editedCabalFile = "4940711977084fce3b86efa958906ba38df63ac450eaf7093ef36268a4c25fe7";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -98003,6 +98375,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98013,8 +98386,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-happstack";
-       version = "0.2.10.6";
-       sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5";
+       version = "0.2.10.7";
+       sha256 = "17fqfax3whslip0knwr21f2h674nz5ayqk6947dryhglvwhsyn5v";
        buildDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -98028,8 +98401,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-snap";
-       version = "0.1.17.16";
-       sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia";
+       version = "0.1.17.17";
+       sha256 = "1q2w9p9g66fv4mq566895l15l8ywz7nl4bf0zlyf1ng64fmi9far";
        buildDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
@@ -98055,16 +98428,18 @@ self: {
      }) {};
 
   "rest-types" = callPackage
-    ({ mkDerivation, aeson, base, generic-aeson, hxt, json-schema, mtl
-     , regular, regular-xmlpickler, rest-stringmap, text, uuid
+    ({ mkDerivation, aeson, base, case-insensitive, generic-aeson, hxt
+     , json-schema, mtl, regular, regular-xmlpickler, rest-stringmap
+     , text, transformers, transformers-compat, uuid
      }:
      mkDerivation {
        pname = "rest-types";
-       version = "1.12";
-       sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6";
+       version = "1.13";
+       sha256 = "0z8wvg9w4am3y5dy5nmabz4ngpks3abrg5gibwcq56x8h8rf8405";
        buildDepends = [
-         aeson base generic-aeson hxt json-schema mtl regular
-         regular-xmlpickler rest-stringmap text uuid
+         aeson base case-insensitive generic-aeson hxt json-schema mtl
+         regular regular-xmlpickler rest-stringmap text transformers
+         transformers-compat uuid
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
@@ -98077,8 +98452,9 @@ self: {
      }:
      mkDerivation {
        pname = "rest-wai";
-       version = "0.1.0.6";
-       sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz";
+       version = "0.1.0.7";
+       sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v";
+       editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981";
        buildDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -98412,8 +98788,8 @@ self: {
      }:
      mkDerivation {
        pname = "rhythm-game-tutorial";
-       version = "0.1";
-       sha256 = "1ib6a0skxmhngvii11ikyibg862j5l4dcjyd2l141v8nsb0incpn";
+       version = "0.1.1";
+       sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base call containers lens mtl objective split ];
@@ -100330,7 +100706,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scenegraph" = callPackage
@@ -100622,7 +100997,6 @@ self: {
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scons2dot" = callPackage
@@ -100944,20 +101318,21 @@ self: {
      }) {};
 
   "scyther-proof" = callPackage
-    ({ mkDerivation, array, base, cmdargs, containers, directory
+    ({ mkDerivation, alex, array, base, cmdargs, containers, directory
      , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time
-     , uniplate
+     , uniplate, utf8-string
      }:
      mkDerivation {
        pname = "scyther-proof";
-       version = "0.8.0.0";
-       sha256 = "1amfa1z6lzgcq7c2qijvrb7i6cyjx5cqvz4yqfxi680m674zn0gz";
+       version = "0.10.0.0";
+       sha256 = "1mzv56d1v4r0024azz7s1yfxpdq53yf6231657y9hnc5z1ybsig3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base cmdargs containers directory filepath json mtl parsec
-         pretty process safe tagsoup time uniplate
+         pretty process safe tagsoup time uniplate utf8-string
        ];
+       buildTools = [ alex ];
        jailbreak = true;
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
@@ -100981,7 +101356,6 @@ self: {
        homepage = "https://github.com/davnils/sde-solver";
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -102043,7 +102417,6 @@ self: {
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -102060,7 +102433,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sessions" = callPackage
@@ -102534,8 +102906,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.4";
-       sha256 = "1a5pim3gqmsc4karc9qvqad3hdsv7jr5h6ly560hzkb527gdxcnb";
+       version = "2.0.4.1";
+       sha256 = "0z3aw13kjknrb0r15jffvc4b2aj89r1zl83ighs2cv318dd89qzi";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process system-fileio system-filepath
@@ -102725,7 +103097,6 @@ self: {
        homepage = "https://github.com/chrisdone/shell-conduit";
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -102827,15 +103198,14 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.0";
-       sha256 = "0yrx7sv1s8pddpap143d3yi3ypvf84jjh16i8b3dm4kb3m4x3mdv";
+       version = "1.6.1";
+       sha256 = "01j25pw9xywfmw3rgi756n1sdzlclwbhsj6dgwalsc8rbpwdbynv";
        buildDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
          system-fileio system-filepath text time transformers
          transformers-base unix-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -104354,6 +104724,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie" = callPackage
+    ({ mkDerivation, base, linear, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.1.0.0";
+       sha256 = "1njg9lw3wc11q15yh4mi1hmfmr4891w59pdwxy782jgqlxanmbx7";
+       buildDepends = [ base linear vector ];
+       homepage = "https://github.com/phaazon/smoothie";
+       description = "Smooth curves via several spline and polynomials";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smt-lib" = callPackage
     ({ mkDerivation, array, base, directory, polyparse }:
      mkDerivation {
@@ -104494,7 +104876,7 @@ self: {
        pname = "snap";
        version = "0.13.3.2";
        sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp";
-       editedCabalFile = "8ec54d7a35cd1c249835815239ac79cb3171ea590a75de1fed30dadac81040e7";
+       editedCabalFile = "2ffeb6e3e6d6d54819bc8c7d58c4bdabf1911599c4e83ededbda4f5719c0298f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104563,6 +104945,7 @@ self: {
        version = "0.2.1.2";
        sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
        buildDepends = [ base blaze-html snap-core ];
+       jailbreak = true;
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
        license = stdenv.lib.licenses.bsd3;
@@ -104836,8 +105219,8 @@ self: {
        pname = "snaplet-acid-state";
        version = "0.2.6.1";
        sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
+       editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7";
        buildDepends = [ acid-state base snap text ];
-       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -104885,7 +105268,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-amqp";
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -105416,7 +105798,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -108323,8 +108704,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.1.9.1";
-       sha256 = "0zk5n7iicgzfkxnw1maa3l41wn3rj4w311zrwrziv2b4mk7997sp";
+       version = "0.1.10.0";
+       sha256 = "15bsjprj3xr7bcqskgjs9c1pgy1yq56579qj4r4wk1ccg3kqfw8q";
        buildDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
@@ -108755,8 +109136,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-haskell-mode";
-       version = "1.0.19";
-       sha256 = "0pf6mhd2385k5fj5a84g1gi8jnhizm3929dadq7zvcbpkzs42pf5";
+       version = "1.0.20";
+       sha256 = "1pcy83ic95l7k3839py4m10zlx4s4pk4n3bsx3mb7n8rp8zngcv2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -109958,8 +110339,8 @@ self: {
      }:
      mkDerivation {
        pname = "system-canonicalpath";
-       version = "0.3.0.0";
-       sha256 = "1wfqfj98wvx9pjnkszca471s8dksgzp1b6wy7d7s3y6g1v8rca7d";
+       version = "0.3.1.0";
+       sha256 = "1ziv64rdydx0kg1wip3mskwaj35la1h94017dy5hnn2hj4g8fh3j";
        buildDepends = [
          base basic-prelude directory system-filepath text
        ];
@@ -110326,9 +110707,8 @@ self: {
     ({ mkDerivation, base, csv, html, mtl }:
      mkDerivation {
        pname = "tabular";
-       version = "0.2.2.5";
-       sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740";
-       editedCabalFile = "9e1a07443018009aa697caa2713231daafed4dfd734a275268831bfb5aebd05f";
+       version = "0.2.2.6";
+       sha256 = "0biqi0cypzwf7s15an7njklxk7j0psfk13ii9w72vpv5vmvf1acf";
        buildDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
@@ -111361,6 +111741,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "template-haskell-util" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "template-haskell-util";
+       version = "0.1.0.1";
+       sha256 = "085b9ybdihmns45pbwzalipmak6am83fsx61m2ik3a1y2y780910";
+       buildDepends = [ base template-haskell ];
+       homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
+       description = "Some utilities for template Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "template-hsml" = callPackage
     ({ mkDerivation, base, blaze-markup, haskell-src-exts
      , haskell-src-meta, parsec, QuickCheck, template-haskell
@@ -111418,7 +111810,6 @@ self: {
        homepage = "https://github.com/ixmatus/hs-tempodb";
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-csound" = callPackage
@@ -111787,7 +112178,6 @@ self: {
        homepage = "http://batterseapower.github.com/test-framework/";
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -111825,7 +112215,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -111943,7 +112332,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-sandbox-compose" = callPackage
@@ -111981,7 +112369,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -111998,7 +112385,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-shouldbe" = callPackage
@@ -112178,6 +112564,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-and-plots" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
+     , markdown, unordered-containers
+     }:
+     mkDerivation {
+       pname = "text-and-plots";
+       version = "0.1.1.0";
+       sha256 = "1z395lps6js993by3pg4vi6g373r85j36g5akfqd9s0k6bz67wsm";
+       buildDepends = [
+         aeson base blaze-html bytestring containers markdown
+         unordered-containers
+       ];
+       homepage = "https://github.com/andersjel/haskell-text-and-plots";
+       description = "EDSL to create HTML documents with plots based on the C3.js library.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-binary" = callPackage
     ({ mkDerivation, base, binary, text }:
      mkDerivation {
@@ -112636,15 +113039,14 @@ self: {
      }:
      mkDerivation {
        pname = "th-alpha";
-       version = "0.2.0.1";
-       sha256 = "02bym2rk3lm0l09n6fp68v144l3mv67qjlifsja4q9iya530ckls";
+       version = "0.2.0.2";
+       sha256 = "1syp28514wwj2c66jcx89zl5ax311jhywqgpcpqlfapfwqphysgk";
        buildDepends = [
          base containers mmorph mtl template-haskell th-desugar transformers
        ];
        testDepends = [
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/jkarni/th-alpha";
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
@@ -112783,9 +113185,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-lift";
-       version = "0.7";
-       sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza";
-       editedCabalFile = "8c27e18de29621de1588e4c0e6dd5c72c6e1e088fd998d5475458062f607aed5";
+       version = "0.7.1";
+       sha256 = "18a9iz56nkdwlqrrrq4dsafnrlcw7cf0pxadbl14sfjlma2ypdff";
        buildDepends = [ base template-haskell ];
        testDepends = [ base template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
@@ -112815,12 +113216,15 @@ self: {
      }) {};
 
   "th-orphans" = callPackage
-    ({ mkDerivation, base, template-haskell, th-lift, th-reify-many }:
+    ({ mkDerivation, base, hspec, template-haskell, th-lift
+     , th-reify-many
+     }:
      mkDerivation {
        pname = "th-orphans";
-       version = "0.9.0";
-       sha256 = "150859mxwn40xkwbfbwsxi05x8j8dq5qvx53i956fqh1gp4sx4p3";
+       version = "0.9.1";
+       sha256 = "04l9alpx51lqsw5l70krjjaf914wi1bmghcak514kyahv1xdcc8q";
        buildDepends = [ base template-haskell th-lift th-reify-many ];
+       testDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112850,12 +113254,12 @@ self: {
      }:
      mkDerivation {
        pname = "th-reify-many";
-       version = "0.1.2";
-       sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9";
-       editedCabalFile = "fe6403c094644e2e0c987dcf2846fc068ccfe32e5291099fb4abb2073e5baf31";
+       version = "0.1.3";
+       sha256 = "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx";
        buildDepends = [
          base containers mtl safe template-haskell th-expand-syns
        ];
+       testDepends = [ base template-haskell ];
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
@@ -113109,8 +113513,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.1.0";
-       sha256 = "13j9hkdq1nxla00xzrfvk21g307zh4cj0b9ryzf7677qlf2kx2ka";
+       version = "1.0.2.0";
+       sha256 = "1k8p8l8fvvc9qrw0qgbbfy9r6h3i1mfkmfzy1g2rsq9kcsc0821r";
        buildDepends = [ base stm time unordered-containers ];
        testDepends = [
          base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
@@ -114601,7 +115005,6 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers_0_4_2_0" = callPackage
@@ -114911,8 +115314,8 @@ self: {
      }:
      mkDerivation {
        pname = "trifecta";
-       version = "1.5.1.2";
-       sha256 = "0g6ywg5p841x781270kgrw1i4fjp9cyqpnaqcg7qgfrixpwalzls";
+       version = "1.5.1.3";
+       sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw";
        buildDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
          blaze-markup bytestring charset comonad containers deepseq
@@ -114922,6 +115325,7 @@ self: {
        testDepends = [
          base directory doctest filepath parsers QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/trifecta/";
        description = "A modern parser combinator library with convenient diagnostics";
        license = stdenv.lib.licenses.bsd3;
@@ -117077,12 +117481,12 @@ self: {
      }) {};
 
   "union-map" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, extensible }:
      mkDerivation {
        pname = "union-map";
-       version = "0.0";
-       sha256 = "01h4n9yspjicii7b7mcg0a8yg8bwfy6hwb7dp82y08846kcb9fh5";
-       buildDepends = [ base containers ];
+       version = "0.1";
+       sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
+       buildDepends = [ base containers extensible ];
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
@@ -117457,8 +117861,8 @@ self: {
      }:
      mkDerivation {
        pname = "unix-time";
-       version = "0.3.4";
-       sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5";
+       version = "0.3.5";
+       sha256 = "0pk7046lmvl7dw6g7508xsixwi3gpiq5dw0a0lfwpfr80g6mh73z";
        buildDepends = [ base binary bytestring old-time ];
        testDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -117686,7 +118090,6 @@ self: {
        homepage = "http://github.com/ppenzin/up/";
        description = "Software management tool";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uploadcare" = callPackage
@@ -118827,8 +119230,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache";
-       version = "0.1.1";
-       sha256 = "1xg7vrkqr6hjkpy6larz72dfk6f63kdr7qvjfrv1wrgpvdvia2jm";
+       version = "0.2.1";
+       sha256 = "1nhcz52fszwyk363hi3xd0k2rx950xbrfq8ifl4i9l9zh3s0p232";
        buildDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
@@ -118889,7 +119292,6 @@ self: {
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcswrapper" = callPackage
@@ -119617,6 +120019,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vivid" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , hashable, mtl, network, split, stm
+     }:
+     mkDerivation {
+       pname = "vivid";
+       version = "0.1.0.1";
+       sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82";
+       editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426";
+       buildDepends = [
+         base binary bytestring containers deepseq hashable mtl network
+         split stm
+       ];
+       jailbreak = true;
+       description = "Sound synthesis with SuperCollider";
+       license = "GPL";
+     }) {};
+
   "vk-aws-route53" = callPackage
     ({ mkDerivation, aws, base, bytestring, containers, http-conduit
      , http-types, old-locale, resourcet, text, time, xml-conduit
@@ -119836,8 +120256,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai";
-       version = "3.0.2.2";
-       sha256 = "1whfpycwcj2xx81llvzgrmi5fxkjfqjipfdkld17jbd6klgfkyzc";
+       version = "3.0.2.3";
+       sha256 = "1mrry121xjgd2h69m35khgsiicrwhg7ysa7mzm6bw3ac41xc08ns";
        buildDepends = [
          base blaze-builder bytestring http-types network text vault
        ];
@@ -119995,8 +120415,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.4.1";
-       sha256 = "0d5ivwvbrhg5z8c268kpd29mni2k54ximqjxdapmwv7kmj87ggzg";
+       version = "3.0.4.4";
+       sha256 = "1g5n7xa6pxnxjf0x2kfgl05gqygsnrk9x8y80dmb4cg4zga153vf";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers data-default-class deepseq directory
@@ -120085,8 +120505,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-handler-launch";
-       version = "3.0.0.2";
-       sha256 = "170a48i651zxq9xb1c45x1i5qx064yd99habha31bqbncl9s5wnq";
+       version = "3.0.0.3";
+       sha256 = "1nx90z37f296gqh0m9rgvw7899jizpclb6fbwhp98byy9s2ssabl";
        buildDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
@@ -120359,15 +120779,16 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-hmac-client";
-       version = "0.1.0.0";
-       sha256 = "1mvd3gzvn2qanrk9xh6adsq8xjnwiynw97kbv8fd74pkhj7i9xlz";
+       version = "0.1.0.2";
+       sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-client http-types mtl old-locale time transformers
          word8
        ];
-       homepage = "https://github.com/creichert/wai-middleware-hmac";
-       description = "Wai HMAC Authentication Middleware Client";
+       description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -120411,6 +120832,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-throttle" = callPackage
+    ({ mkDerivation, base, bytestring, haddock, hlint, hspec
+     , http-types, HUnit, network, process, regex-compat, stm, text
+     , token-bucket, transformers, unordered-containers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-throttle";
+       version = "0.1.0.1";
+       sha256 = "1404i9f8pcvhpa2kjz5rc7r18f5dk7889v576i5k41faxb749ig0";
+       buildDepends = [
+         base bytestring http-types network stm text token-bucket
+         transformers unordered-containers wai
+       ];
+       testDepends = [
+         base bytestring haddock hlint hspec http-types HUnit process
+         regex-compat stm transformers unordered-containers wai wai-extra
+       ];
+       jailbreak = true;
+       description = "WAI Middleware for Request Throttling";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-predicates" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, cookie, http-types
@@ -120607,7 +121050,6 @@ self: {
        homepage = "https://github.com/gregwebs/wai-static-pages";
        description = "generate static html pages from a WAI application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-test" = callPackage
@@ -120620,7 +121062,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-throttler" = callPackage
@@ -120629,8 +121070,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-throttler";
-       version = "0.1.0.3";
-       sha256 = "0wfbmjdw8k63fs4425fpnq24xssl9yf16dpy6cwkz68dn0vs0dkd";
+       version = "0.1.0.5";
+       sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6";
        buildDepends = [ base bytestring containers http-types time wai ];
        jailbreak = true;
        description = "Wai middleware for request throttling";
@@ -120663,8 +121104,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-websockets";
-       version = "3.0.0.4";
-       sha256 = "0bnwx1fxvr7v0v2apl1sdssz2nrmb9rn86ix2kmwv323i60f6g4c";
+       version = "3.0.0.5";
+       sha256 = "1gqivkjdvln6xpkhcr6k75gk2qvjp6mr691902w3m6xpcdv1q5z0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -120709,8 +121150,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.9";
-       sha256 = "1rlkfxm2ryyzdl3clbs4qaka80wja9nn1pakl7rvn4rv809g1kgi";
+       version = "3.0.9.2";
+       sha256 = "0wr41drsklxkxl733v78fn05f8ylq7cq49hw3r4axrfmsmwd13p4";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          ghc-prim hashable http-date http-types iproute network
@@ -120770,8 +121211,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.1.4";
-       sha256 = "1f4bwyck6lg3jndsspimpa92p71zxmlxmk9zjx1hkplld2i4psdk";
+       version = "3.0.2";
+       sha256 = "1jhra0iq7iph4cn5lq98892rapzws2nsf1pyb70gpww4l3bgjfzd";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -121223,8 +121664,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.6.0.4";
-       sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
+       version = "0.6.1";
+       sha256 = "1464i2hzriimhykgi0sinndyz3r7vajkzpwyp80fc75piq6vr7wi";
        buildDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
@@ -121233,7 +121674,6 @@ self: {
          transformers-base unordered-containers vector zip-archive
        ];
        testDepends = [ base parallel text ];
-       jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -121433,8 +121873,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.9.2.2";
-       sha256 = "0zpx16rvx8imhad4av8sa7jf39v785xrnfy6l51jnhda5mfxaip4";
+       version = "0.9.3.0";
+       sha256 = "0aq0mbfi1sh55z46pcy3g0n3zjqw176pah4zny0nk8l3gl8ss7v1";
        buildDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text
@@ -121557,6 +121997,7 @@ self: {
        pname = "welshy";
        version = "0.1.0.0";
        sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki";
+       editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c";
        buildDepends = [
          aeson base blaze-builder bytestring conduit http-types lifted-base
          resourcet text transformers unordered-containers wai warp
@@ -121861,6 +122302,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wl-pprint-ansiterm" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
+     , nats, semigroups, text, transformers, wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "wl-pprint-ansiterm";
+       version = "0.2.0.0";
+       sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz";
+       buildDepends = [
+         ansi-terminal base bytestring containers mtl nats semigroups text
+         transformers wl-pprint-extras
+       ];
+       homepage = "https://github.com/seagull-kamome/wl-pprint-ansiterm";
+       description = "ANSI Terminal support with wl-pprint-extras";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wl-pprint-extras" = callPackage
     ({ mkDerivation, base, containers, HUnit, nats, semigroupoids
      , semigroups, test-framework, test-framework-hunit, text
@@ -122022,8 +122480,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "word8";
-       version = "0.1.1";
-       sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r";
+       version = "0.1.2";
+       sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw";
        buildDepends = [ base ];
        testDepends = [ base hspec ];
        description = "Word8 library";
@@ -123015,6 +123473,7 @@ self: {
        testDepends = [
          base blaze-markup bytestring old-locale text time zip-archive
        ];
+       jailbreak = true;
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123072,8 +123531,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "xml";
-       version = "1.3.13";
-       sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
+       version = "1.3.14";
+       sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
        buildDepends = [ base bytestring text ];
        homepage = "http://code.galois.com";
        description = "A simple XML library";
@@ -123123,8 +123582,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.3.2";
-       sha256 = "1vk4ldcacpwfmhiqpcs571s5kqsh7v0ch2sfrw2ibkm0cyqs6jk9";
+       version = "1.2.3.3";
+       sha256 = "0y5k2l6a4vl5gl8ch8gwjqyg0v2qkiwrixf0yb0ik71z8zb9ki8b";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -123505,6 +123964,7 @@ self: {
        pname = "xmlhtml";
        version = "0.2.3.4";
        sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr";
+       editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9";
        buildDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
@@ -123996,7 +124456,6 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xtest" = callPackage
@@ -124491,6 +124950,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yeller" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, network, stm, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yeller";
+       version = "0.1.0.4";
+       sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j";
+       buildDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types network stm text unordered-containers
+       ];
+       testDepends = [
+         aeson base bytestring containers hspec http-client http-client-tls
+         http-types network stm text unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://yellerapp.com";
+       description = "A Yeller Client For Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yes-precure5-command" = callPackage
     ({ mkDerivation, base, Cabal, containers, hspec, mtl, parsec
      , QuickCheck, random
@@ -124562,8 +125044,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.3";
-       sha256 = "05x4mzf6c1ab2bf724wmsl6dqhqqjw12j44q0c4v4szcp4fngsab";
+       version = "1.4.3.1";
+       sha256 = "08kyg83alf1z1c5llr5gbfg827ds1fvyz0d7vicmx6fzl1m9nkzb";
        buildDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -124836,8 +125318,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.3.7";
-       sha256 = "07fnh6mxhrdf7bhd0c4l8il2qswr2sbl7dzapy2f9jf9cznidbn2";
+       version = "1.4.3.10";
+       sha256 = "0x8bjqvi46fp870cpfdpmy141axyhk3jcsvswza6j4w2mkg7iarf";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -125228,6 +125710,7 @@ self: {
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
@@ -125440,6 +125923,7 @@ self: {
          purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
          system-filepath template-haskell text time transformers yesod-core
        ];
+       jailbreak = true;
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -125472,6 +125956,7 @@ self: {
        pname = "yesod-routes";
        version = "1.2.0.7";
        sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
+       editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e";
        buildDepends = [
          base containers path-pieces template-haskell text vector
        ];
@@ -125481,7 +125966,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/";
-       description = "Efficient routing for Yesod";
+       description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 2824296c08fc..763164cec876 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -30,8 +30,8 @@ let
   libDir        = "$out/lib/ghc-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
-  isHaskellPkg  = x: (x ? pname) && (x ? version) && (x ? env);
-  paths         = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages);
+  paths         = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages);
+  hasLibraries  = stdenv.lib.any (x: x.isHaskellLibrary) paths;
 in
 if paths == [] then ghc else
 buildEnv {
@@ -73,7 +73,7 @@ buildEnv {
       makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
     done
 
-    $out/bin/ghc-pkg recache
+    ${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"}
     $out/bin/ghc-pkg check
   '';
 } // {
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index ae3f014eee19..0c93625026ab 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
-    sha256 = "1wb0rb89mvy1x64a8z9z3jmphw72vnkxaqbc0f2v35c2wv61p839";
+    sha256 = "1bhsv804iik497gflgp0wfhj6j4ylrladp1xndcszlfg576r1zch";
   };
 
   installPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An agile dynamic language for the Java Platform";
-    homepage = http://groovy.codehaus.org/;
+    homepage = http://groovy-lang.org/;
     license = licenses.asl20;
     maintainers = with maintainers; [ pSub ];
   };
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 7545e80fd117..dc3d700dc8e1 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -31,9 +31,7 @@ stdenv.mkDerivation rec {
   # there is a mysterious sh: command not found
   doCheck = false;
 
-  /* The build failed with a missing libranlib.la in hydra,
-     but worked on my computer. I think they have concurrency problems */
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 5c99428463d7..10bb8b3215df 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -21,7 +21,7 @@ with stdenv.lib;
 let
   majorVersion = "3.4";
   pythonVersion = majorVersion;
-  version = "${majorVersion}.2";
+  version = "${majorVersion}.3";
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w";
+    sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index f3104757fe8b..55747061406c 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.3";
+  version = "2.5.4";
   name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "06j1cgw9h9ya5z8gpcf9v9zik3l4xz7sr4wshj06kznzz5z3sf4x";
+    sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index b0feb2b60083..a59b526fee16 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.1";
+  version = "1.11.2";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
+    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
   };
 
   buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ];
@@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-geotiff=${libgeotiff}"
     "--with-python"               # optional
     "--with-static-proj4=${proj}" # optional
+    "--with-geos=${geos}/bin/geos-config"# optional
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 1313bc3feebc..be3f803cff8e 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -28,7 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57";
     libav_9   = libavFun   "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273";
-    libav_11  = libavFun  "11"    "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f";
+    libav_11  = libavFun  "11.2"  "52ba52cabe5d86b45ce62f56e11fa7912c6e5083";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
new file mode 100644
index 000000000000..64f0e74084fc
--- /dev/null
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 3609d88..48c6bc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then
+   AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
+   AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
+   AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
++  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+ fi
+ AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
+ 
+diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+index c622801..f4aab9b 100644
+--- a/src/libbluray/bdj/bdj.c
++++ b/src/libbluray/bdj/bdj.c
+@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void)
+ #ifdef _WIN32
+         "" BDJ_JARFILE,
+ #else
+-        "/usr/share/java/" BDJ_JARFILE,
++        JARDIR "/" BDJ_JARFILE,
+ #endif
+     };
+ 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 3bcf62036ab8..170c4e461882 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -2,9 +2,11 @@
 , withAACS ? false, libaacs ? null, jdk ? null, ant ? null
 , withMetadata ? true, libxml2 ? null
 , withFonts ? true, freetype ? null
+# Need to run autoreconf hook after BDJ jarfile patch
+, autoreconfHook ? null
 }:
 
-assert withAACS -> jdk != null && ant != null && libaacs != null;
+assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null;
 assert withMetadata -> libxml2 != null;
 assert withFonts -> freetype != null;
 
@@ -28,17 +30,27 @@ stdenv.mkDerivation rec {
 
   buildInputs =  with stdenv.lib;
                  [fontconfig]
-              ++ optionals withAACS [jdk libaacs]
+              ++ optionals withAACS [ jdk autoreconfHook ]
               ++ optional withMetadata libxml2
               ++ optional withFonts freetype
               ;
 
+  propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
+
+  preConfigure = stdenv.lib.optionalString withAACS ''
+    export JDK_HOME=${jdk.home}
+    export LIBS="$LIBS -L${libaacs} -laacs"
+  '';
+
   configureFlags =  with stdenv.lib;
-                    optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]
+                    optional withAACS "--enable-bdjava"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
+  # Fix search path for BDJ jarfile
+  patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch;
+
   meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index eb617ed6b9e9..5d120f61e086 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -1,40 +1,18 @@
-{ stdenv, fetchurl, zlib, libpng, patchutils }:
+{ stdenv, fetchzip, cmake, zlib, libpng }:
 
 stdenv.mkDerivation {
-  name = "libharu-2.2.1";
+  name = "libharu-2.3.0";
 
-  src = fetchurl {
-    url = http://libharu.org/files/libharu-2.2.1.tar.bz2;
-    sha256 = "04493rjb4z8f04p3kjvnya8phg4b0vzy3mbdbp8jfy0dhvqg4h4j";
+  src = fetchzip {
+    url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz;
+    sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
   };
 
-  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
-
-  buildInputs = [ zlib libpng ];
-
-  patches =
-    [ (stdenv.mkDerivation {
-        name = "linpng15.patch";
-
-        src = fetchurl {
-          url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
-          sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb";
-        };
-
-        nativeBuildInputs = [ patchutils ];
-
-        buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
-      })
-      (fetchurl {
-        url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
-        name = "endless-loop.patch";
-        sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr";
-      })
-    ];
+  buildInputs = [ zlib libpng cmake ];
 
   meta = {
     description = "Cross platform, open source library for generating PDF files";
-    homepage = http://libharu.org/wiki/Main_Page;
+    homepage = http://libharu.org/;
     license = stdenv.lib.licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 52b88244fd9a..a57ff0bb7378 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,20 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }:
+{ stdenv, fetchurl, pkgconfig
+, libevdev, mtdev, udev
+, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation
+, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
+, testsSupport ? false, check ? null, valgrind ? null
+}:
 
+assert documentationSupport -> doxygen != null && graphviz != null;
+assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
+assert testsSupport -> check != null && valgrind != null;
+
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.10.0";
+  name = "libinput-0.11.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0h8lbhhxb5020bhdblxp1pkapy4bchjj3l44fxabz9pi1zw03q2c";
+    sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j";
   };
 
-  buildInputs = [ pkgconfig mtdev udev libevdev ];
+  configureFlags = [
+    (mkFlag documentationSupport "documentation")
+    (mkFlag eventGUISupport "event-gui")
+    (mkFlag testsSupport "tests")
+  ];
 
-  meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/libinput;
-    description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver";
-    platforms = platforms.unix;
-    license = licenses.mit;
-    maintainers = with maintainers; [ wkennington ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libevdev mtdev udev ]
+    ++ optionals eventGUISupport [ cairo glib gtk3 ]
+    ++ optionals documentationSupport [ doxygen graphviz ]
+    ++ optionals testsSupport [ check valgrind ];
+
+  meta = {
+    description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
+    homepage    = http://www.freedesktop.org/wiki/Software/libinput;
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ codyopel wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
new file mode 100644
index 000000000000..dbfa1656a1a6
--- /dev/null
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libsass-${version}";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sass";
+    repo = "libsass";
+    rev = version;
+    sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
+  };
+
+  preConfigure = ''
+    autoreconf --force --install
+  '';
+
+  buildInputs = [ autoconf automake libtool ];
+
+  meta = with lib; {
+    description = "A C/C++ implementation of a Sass compiler";
+    license = licenses.mit;
+    homepage = https://github.com/sass/libsass;
+    maintainers = with maintainers; [ offline ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 5f7eb7dad3bb..3ce377dfb08a 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -105,4 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
+    v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
   }
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 09d2e9dfc43c..ae1f0e414487 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvirt-glib-0.1.9";
+  name = "libvirt-glib-0.2.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/glib/${name}.tar.gz";
-    sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5";
+    sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 8bd4866cb21c..9c9bf40b8e81 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
-, dnsmasq, libnl, libpcap
-, pythonPackages
+, dnsmasq, libnl, libpcap, libxslt, xhtml1
+, pythonPackages, perlPackages
 }:
 
-let version = "1.2.9"; in
+let version = "1.2.12"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm";
+    sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg";
   };
 
   buildInputs = [
     pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
     utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-    libcap_ng libnl
+    libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 51656f7ac426..a9c7d51923b5 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.17.3";
+  version = "3.17.4";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${name}.tar.gz";
-    sha256 = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz";
+    sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
new file mode 100644
index 000000000000..14886f021421
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.2";
+  branch = "1.5";
+  src = fetchurl {
+    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
+    sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
+  };
+})
diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix
new file mode 100644
index 000000000000..25575450b477
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.0.1.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0.1";
+  branch = "2";
+  src = fetchurl {
+    url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";
+    sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+  };
+})
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
new file mode 100644
index 000000000000..7e48b656ae28
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0";
+  branch = "2.1";
+  src = fetchurl {
+    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
+    sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
+  };
+})
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
deleted file mode 100644
index 7f23929efb08..000000000000
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, cmake, glib/*passthru only*/ }:
-
-stdenv.mkDerivation rec {
-  name = "openjpeg-2.0.0";
-  passthru = {
-    incDir = "openjpeg-2.0";
-  };
-
-  src = fetchurl {
-    url = "http://openjpeg.googlecode.com/files/${name}.tar.gz";
-    sha1 = "0af78ab2283b43421458f80373422d8029a9f7a7";
-  };
-
-  buildInputs = [ cmake ];
-  nativebuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway
-
-  postInstall = glib.flattenInclude + ''
-    mkdir -p "$out/lib/pkgconfig"
-    cat >"$out/lib/pkgconfig/libopenjp2.pc" <<EOF
-    prefix=$out
-    libdir=$out/lib
-    includedir=$out/include
-
-    Name: openjp2
-    Description: JPEG2000 library (Part 1 and 2)
-    URL: http://www.openjpeg.org/
-    Version: @OPENJPEG_VERSION@
-    Libs: -L$out/lib -lopenjp2
-    Cflags: -I$out/include
-    EOF
-  '';
-
-  meta = {
-    homepage = http://www.openjpeg.org/;
-    description = "Open-source JPEG 2000 codec written in C language";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
new file mode 100644
index 000000000000..a635f68839b7
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -0,0 +1,83 @@
+{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/
+, sharedLibsSupport ? true # Build shared libraries
+, codecSupport ? true # Codec executables
+, mj2Support ? true # MJ2 executables
+, jpwlLibSupport ? true # JPWL library & executables
+, jpipLibSupport ? true # JPIP library & executables
+, jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server
+#, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable
+, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java)
+, jp3dSupport ? true # # JP3D comp
+, thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
+, testsSupport ? false
+# Inherit generics
+, branch, src, version, ...
+}:
+
+assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));
+#assert opjViewerSupport -> (wxGTK != null);
+assert openjpegJarSupport -> (jdk != null);
+assert testsSupport -> codecSupport;
+
+let
+  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+in
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "openjpeg-${version}";
+  inherit branch;
+  inherit version;
+  inherit src;
+
+  cmakeFlags = [
+    (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")
+    (mkFlag codecSupport "BUILD_CODEC")
+    (mkFlag mj2Support "BUILD_MJ2")
+    (mkFlag jpwlLibSupport "BUILD_JPWL")
+    (mkFlag jpipLibSupport "BUILD_JPIP")
+    (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")
+    #(mkFlag opjViewerSupport "BUILD_VIEWER")
+    (mkFlag openjpegJarSupport "BUILD_JAVA")
+    (mkFlag jp3dSupport "BUILD_JP3D")
+    (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
+    (mkFlag testsSupport "BUILD_TESTING")
+  ];
+
+  nativebuildInputs = [ pkgconfig ];
+
+  buildInputs = [ cmake ]
+    ++ optionals jpipServerSupport [ curl fcgi ]
+    #++ optional opjViewerSupport wxGTK
+    ++ optional openjpegJarSupport jdk;
+
+  propagatedBuildInputs = [ libpng libtiff lcms2 ];
+
+  postInstall = glib.flattenInclude + ''
+    mkdir -p "$out/lib/pkgconfig"
+    cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+
+    Name: openjp2
+    Description: JPEG2000 library (Part 1 and 2)
+    URL: http://www.openjpeg.org/
+    Version: @OPENJPEG_VERSION@
+    Libs: -L$out/lib -lopenjp2
+    Cflags: -I$out/include
+    EOF
+  '';
+
+  passthru = {
+    incDir = "openjpeg-${branch}";
+  };
+
+  meta = {
+    description = "Open-source JPEG 2000 codec written in C language";
+    homepage    = http://www.openjpeg.org/;
+    license     = licenses.bsd2;
+    maintainer  = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 0598b0bd684a..32118e182ac1 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.7.1";
+  name = "sqlite-3.8.7.4";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz";
-    sha1 = "5601be1263842209d7c5dbf6128f1cc0b6bbe2e5";
+    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz";
+    sha1 = "70ca0b8884a6b145b7f777724670566e2b4f3cde";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
new file mode 100644
index 000000000000..194a852e7ef9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip, ocaml, findlib, sexplib, ocplib-endian, lwt, camlp4 }:
+
+let version = "1.6.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-cstruct-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-cstruct/archive/v${version}.tar.gz";
+    sha256 = "09qw3rhfiq2kkns6660p9cwm5610k72md52a04cy91gr6gsig6ic";
+  };
+
+  buildInputs = [ ocaml findlib lwt camlp4 ];
+  propagatedBuildInputs = [ ocplib-endian sexplib ];
+
+  configureFlags = "--enable-lwt";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Map OCaml arrays onto C-like structs";
+    homepage = https://github.com/mirage/ocaml-cstruct;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index f1bb496ac007..20fb2ec496b4 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -51,7 +51,7 @@
 
 
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-python.stdenv.mkDerivation (attrs // {
+if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
 
   name = namePrefix + name;
@@ -167,7 +167,6 @@ python.stdenv.mkDerivation (attrs // {
   meta = with lib.maintainers; {
     # default to python's platforms
     platforms = python.meta.platforms;
-    broken = disabled;
   } // meta // {
     # add extra maintainer(s) to every package
     maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index dd3d90e4dd86..202109cdbf68 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
@@ -9,13 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
-  # Python is required only by `make check`
-  buildInputs = [ perl python ];
+  buildInputs = [ perl ];
 
   enableParallelBuilding = true;
 
-  doCheck = true;
-
   postInstall = ''
     mv -v $out/share/man/man1/coan.1.{1,gz}
   '';
diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 3129b10f7b80..631c3305f810 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }:
+{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
 
 let
-  version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0";
+  version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
@@ -11,19 +11,21 @@ in stdenv.mkDerivation {
           then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz"
           else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
     sha256 = if nightly
-             then "0v9njaggddi128v58rd34qknph8pn9c653gqd4y29l1mwjvqg62s"
-             else "17axqswpl252gliak1wjc2l9jk6n5jqdfa9f1vv7x9acj776yrik";
+             then "1bk0jiha7n3s9xawj77d4q1navq28pq061w2wa6cs70lik7n6ri4"
+             else "08g0kmz2978jrfx4551fi12ypcsv9p6vic89lfs08ki7ajw2yrgb";
   };
 
   prePatch = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
   '';
 
-  configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ];
+  configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
 
-  buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux);
+  buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
   setupHook = ../nodejs/setup-hook.sh;
 
+  passthru.interpreterName = "iojs";
+
   meta = {
     description = "A friendly fork of Node.js with an open governance model";
     homepage = https://iojs.org/;
diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs
new file mode 100755
index 000000000000..e0e073a0ff9b
--- /dev/null
+++ b/pkgs/development/web/iojs/update-iojs
@@ -0,0 +1,49 @@
+#!/bin/sh -e
+#
+# Fetch the latest io.js release (stable/nightly) and update
+# `default.nix` in this directory.
+#
+
+cd "$(dirname "$0")"
+
+latest() {
+    curl -s "$1" | grep 'href="v' \
+        | tail -1 | sed 's/.*href="v//;s/\/".*//'
+}
+
+latest_log() {
+    echo "Getting latest $1 version from $2" >&2
+    version=$(latest "$2")
+    echo " -> $version" >&2
+    echo "$version"
+}
+
+url() {
+    nix-instantiate -A "$1" 2> /dev/null | xargs cat \
+        | sed 's/.*"urls","//;s/".*//'
+}
+
+hash() {
+    nix-prefetch-url "$1" 2> /dev/null
+}
+
+hash_log() {
+    echo "Finding hash for $1" >&2
+    value=$(hash "$1")
+    echo " -> $value" >&2
+    echo "$value"
+}
+
+stable=$(latest_log stable 'https://iojs.org/dist/')
+nightly=$(latest_log nightly 'https://iojs.org/download/nightly/')
+
+sed -i \
+    "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \
+    default.nix
+
+stableHash=$(hash_log "$(url iojs.src)")
+nightlyHash=$(hash_log "$(url iojs-nightly.src)")
+
+sed -i \
+    "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \
+    default.nix
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 4b9e057243c0..17c437a7d0f5 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -1,22 +1,33 @@
 { stdenv, runCommand, nodejs, neededNatives}:
 
 {
-  name, src,
+  name, version ? "", src,
+
+  # by default name of nodejs interpreter e.g. "nodejs-${name}"
+  namePrefix ? nodejs.interpreterName + "-",
 
   # Node package name
-  pkgName ? (builtins.parseDrvName name).name,
+  pkgName ?
+    if version != "" then stdenv.lib.removeSuffix "-${version}" name else
+    (builtins.parseDrvName name).name,
 
   # List or attribute set of dependencies
   deps ? {},
 
   # List or attribute set of peer depencies
-  peerDependencies ? [],
+  peerDependencies ? {},
+
+  # List or attribute set of optional dependencies
+  optionalDependencies ? {},
+
+  # List of optional dependencies to skip
+  skipOptionalDependencies ? [],
 
   # Whether package is binary or library
-  bin ? null,
+  bin ? false,
 
-  # Flags passed to npm install
-  flags ? [],
+  # Additional flags passed to npm install
+  flags ? "",
 
   # Command to be run before shell hook
   preShellHook ? "",
@@ -24,6 +35,12 @@
   # Command to be run after shell hook
   postShellHook ? "",
 
+  # Same as https://docs.npmjs.com/files/package.json#os
+  os ? [],
+
+  # Same as https://docs.npmjs.com/files/package.json#cpu
+  cpu ? [],
+
   # Attribute set of already resolved deps (internal),
   # for avoiding infinite recursion
   resolvedDeps ? {},
@@ -34,42 +51,67 @@
 with stdenv.lib;
 
 let
-  npmFlags = concatStringsSep " " (map (v: "--${v}") flags);
-
-  sources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv $(find . -type d -mindepth 1 -maxdepth 1) $out
-  '';
-
-  # Convert deps to attribute set
-  attrDeps = if isAttrs deps then deps else
-    (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
-
-  # All required node modules, without already resolved dependencies
-  requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps);
-
-  # Recursive dependencies that we want to avoid with shim creation
-  recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps);
-
-  peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies;
-
   self = let
-    # Pass resolved dependencies to dependencies of this package
-    deps = map (
-      dep: dep.override {
-        resolvedDeps = resolvedDeps // { "${name}" = self; };
-      }
-    ) (attrValues requiredDeps);
+    sources = runCommand "node-sources" {} ''
+      tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+      mv $(find . -type d -mindepth 1 -maxdepth 1) $out
+    '';
+
+    platforms = fold (entry: platforms:
+      let
+        filterPlatforms = attrByPath [(removePrefix "!" entry)] [] stdenv.lib.platforms;
+      in
+        if hasPrefix "!" entry then
+          filter (p: any (f: p != f) filterPlatforms) platforms
+        else
+          filter (p: any (f: p == f) filterPlatforms) platforms
+    ) nodejs.meta.platforms os;
+
+    mapDependencies = deps: f: rec {
+      # Convert deps to attribute set
+      attrDeps = if isAttrs deps then deps else
+        (listToAttrs (map (dep: nameValuePair dep.name dep) deps));
+
+      # All required node modules, without already resolved dependencies
+      # Also override with already resolved dependencies
+      requiredDeps = mapAttrs (name: dep:
+        dep.override {
+          resolvedDeps = resolvedDeps // { "${name}" = self; };
+        }
+      ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps)));
+
+      # Recursive dependencies that we want to avoid with shim creation
+      recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps));
+    };
+
+    _dependencies = mapDependencies deps (name: dep:
+      dep.pkgName != pkgName);
+    _optionalDependencies = mapDependencies optionalDependencies (name: dep:
+      any (platform: stdenv.system == platform) dep.meta.platforms &&
+      all (d: d != dep.pkgName) skipOptionalDependencies
+    );
+    _peerDependencies = mapDependencies peerDependencies (name: dep:
+      dep.pkgName != pkgName);
+
+    requiredDependencies =
+      _dependencies.requiredDeps //
+      _optionalDependencies.requiredDeps //
+      _peerDependencies.requiredDeps;
+
+    recursiveDependencies =
+      _dependencies.recursiveDeps //
+      _optionalDependencies.recursiveDeps //
+      _peerDependencies.recursiveDeps;
 
     patchShebangs = dir: ''
-        node=`type -p node`
-        coffee=`type -p coffee || true`
-        find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \
-        xargs sed --follow-symlinks -i \
-            -e 's@#!/usr/bin/env node@#!'"$node"'@' \
-            -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
-            -e 's@#!/.*/node@#!'"$node"'@' \
-            -e 's@#!/.*/coffee@#!'"$coffee"'@' || true
+      node=`type -p node`
+      coffee=`type -p coffee || true`
+      find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \
+      xargs sed --follow-symlinks -i \
+          -e 's@#!/usr/bin/env node@#!'"$node"'@' \
+          -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
+          -e 's@#!/.*/node@#!'"$node"'@' \
+          -e 's@#!/.*/coffee@#!'"$coffee"'@' || true
     '';
 
   in stdenv.mkDerivation ({
@@ -147,9 +189,9 @@ let
       # We do not handle shrinkwraps yet
       rm npm-shrinkwrap.json 2>/dev/null || true
 
-      mkdir build-dir
+      mkdir ../build-dir
       (
-        cd build-dir
+        cd ../build-dir
         mkdir node_modules
 
         # Symlink or copy dependencies for node modules
@@ -161,12 +203,7 @@ let
           '' else ''
             cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/
           ''
-        ) deps}
-
-        # Symlink peer dependencies
-        ${concatMapStrings (dep: ''
-          ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
-        '') peerDeps}
+        ) (attrValues requiredDependencies)}
 
         # Create shims for recursive dependenceies
         ${concatMapStrings (dep: ''
@@ -177,10 +214,10 @@ let
               "version": "${getVersion dep}"
           }
           EOF
-        '') (attrValues recursiveDeps)}
+        '') (attrValues recursiveDependencies)}
       )
 
-      export HOME=$PWD/build-dir
+      export HOME=$PWD/../build-dir
       runHook postConfigure
     '';
 
@@ -189,14 +226,14 @@ let
 
       # If source was a file, repackage it, so npm pre/post publish hooks are not triggered,
       if [[ -f $src ]]; then
-        tar --exclude='build-dir' -czf build-dir/package.tgz ./
+        GZIP=-1 tar -czf ../build-dir/package.tgz ./
         export src=$HOME/package.tgz
       else
         export src=$PWD
       fi
 
       # Install package
-      (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags})
+      (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags})
 
       runHook postBuild
     '';
@@ -211,7 +248,7 @@ let
         ${concatMapStrings (dep: ''
           rm node_modules/${dep.pkgName}/package.json
           rmdir node_modules/${dep.pkgName}
-        '') (attrValues recursiveDeps)}
+        '') (attrValues recursiveDependencies)}
 
         mkdir -p $out/lib/node_modules
 
@@ -230,10 +267,10 @@ let
           done
         fi
 
-        # Symlink dependencies
+        # Move peer dependencies to node_modules
         ${concatMapStrings (dep: ''
           mv node_modules/${dep.pkgName} $out/lib/node_modules
-        '') peerDeps}
+        '') (attrValues _peerDependencies.requiredDeps)}
 
         # Install binaries and patch shebangs
         mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
@@ -256,25 +293,36 @@ let
       mkdir -p node_modules
       ${concatMapStrings (dep: ''
         ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
-      '') deps}
+      '') (attrValues requiredDependencies)}
       ${postShellHook}
     '';
 
+    # Stipping does not make a lot of sense in node packages
+    dontStrip = true;
+
+    meta = {
+      platforms = platforms;
+      maintainers = [ stdenv.lib.maintainers.offline ];
+    };
+
     passthru.pkgName = pkgName;
-  } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
-    name = "${
-      if bin == true then "bin-" else if bin == false then "node-" else ""
-    }${name}";
+  } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // {
+    name = namePrefix + name;
 
     # Run the node setup hook when this package is a build input
     propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
 
-    # Make buildNodePackage useful with --run-env
-    nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives;
+    nativeBuildInputs =
+      (args.nativeBuildInputs or []) ++ neededNatives ++
+      (attrValues requiredDependencies);
 
     # Expose list of recursive dependencies upstream, up to the package that
     # caused recursive dependency
-    recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps);
+    recursiveDeps =
+      (flatten (
+        map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies)
+      )) ++
+      (attrNames recursiveDependencies);
   });
 
 in self
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 27bb65ccbc7a..53d09178fc9d 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, unstableVersion ? false 
+{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, unstableVersion ? false
 }:
 
 let
@@ -10,9 +10,8 @@ let
 
   version = if unstableVersion then "0.11.13" else "0.12.0";
 
-  # !!! Should we also do shared libuv?
   deps = {
-    inherit openssl zlib;
+    inherit openssl zlib libuv;
 
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
@@ -55,6 +54,8 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
   setupHook = ./setup-hook.sh;
 
+  passthru.interpreterName = "nodejs";
+
   meta = {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index c7144b96a3d7..6b4c6e68bacc 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }:
+{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }:
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.2.018";
+  version = "4.2.023";
   srcs =
     [ (fetchurl {
-         url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full018.zip";
-         sha256 = "10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83";
+         url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip";
+         sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090";
        })
       (fetchurl {
-         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz";
-         sha256 = "c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494";
+         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz";
+         sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp";
        })
     ];
-  buildInputs = [ unzip SDL mesa openal curl ];
-  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.018";
+  buildInputs = [ unzip SDL mesa openal curl libXxf86vm];
+  sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023";
   configurePhase = ''
     echo "USE_OPENAL = 1" > Makefile.local
     echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 2b594299c285..e3aae9669967 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -655,11 +655,11 @@ rec {
 
   };
   "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-02-10";
+    name = "Gist";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "4d64b05bcbfdc8c22f37ff29776626be48251af7";
-      sha256 = "16101ab3802bbeba7e83706446474b61fbb6312270161cdb669780b54c3c04cf";
+      rev = "8a567b823163d349406dffaff4519e0bac10eade";
+      sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88";
     };
     dependencies = [];
 
@@ -675,111 +675,111 @@ rec {
 
   };
   "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2013-11-26";
+    name = "Hoogle";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
       rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
-      sha256 = "e5a95db90efdb93cd06c0c6946c24ae3e401800dd0da344cc83171ff1bc696f2";
+      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
     };
     dependencies = [];
 
   };
   "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Solarized-2011-05-09";
+    name = "Solarized";
     src = fetchgit {
       url = "git://github.com/altercation/vim-colors-solarized";
       rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "1de517cfc66707e44c2d4d72080ee949cfb963a087e9e52c62cc4394f13ed597";
+      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
     };
     dependencies = [];
 
   };
   "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-02-15";
+    name = "Supertab";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
-      sha256 = "9f610d2acd57537f6fa2bfafb9300fe7d42afedf30bc4bb3fb02974743f9ab27";
+      rev = "454c06e25680799b6f408622d6bfbaf920ace825";
+      sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01";
     };
     dependencies = [];
 
   };
   "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-02-17";
+    name = "Syntastic";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "47821840200cd8e14e99001caac602a37cdf8d5c";
-      sha256 = "becf0b07d25d9514ac7c5328d4e3deeab5731792887c8334571b72c3871a50ee";
+      rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52";
+      sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723";
     };
     dependencies = [];
 
   };
   "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tabular-2013-05-16";
+    name = "Tabular";
     src = fetchgit {
       url = "git://github.com/godlygeek/tabular";
       rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
-      sha256 = "dbfbeaf833ecc87c7f505fe25c79110f10535d81065fd4a30853565d288448d6";
+      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
     };
     dependencies = [];
 
   };
   "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-02-16";
+    name = "Tagbar";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "a284cd009104b5c9b64a378cd98fdf4993c1689e";
-      sha256 = "c6458537ea211a77a8fb6f85b4d7eac1fec6714fd60398ebae00647599397922";
+      rev = "00dfa82b00e734b453153564efeec933c48087f0";
+      sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635";
     };
     dependencies = [];
 
   };
   "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2014-07-08";
+    name = "The_NERD_Commenter";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
       rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
-      sha256 = "7624da2591153946e0e9d0637c31b551bc1f87cea8441d725bdd01b0cd972588";
+      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
     };
     dependencies = [];
 
   };
   "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2014-11-20";
+    name = "The_NERD_tree";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
       rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921";
-      sha256 = "75aa60c361c66c0bae986fc6a7111ccf529ab74409a9e11355e4c2fa065e1afc";
+      sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0";
     };
     dependencies = [];
 
   };
   "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-02-14";
+    name = "UltiSnips";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "56ac14840f47521be9b61fb5ae72930f35d5d8a9";
-      sha256 = "a0766d809a0a858e3393429d67e68e7a85d67519e143a64e8ddd3f7fa2418ca6";
+      rev = "d693259abb2e28f70abf760d395fcf526d5272ee";
+      sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600";
     };
     dependencies = [];
 
   };
   "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2015-01-09";
+    name = "VimOutliner";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
       rev = "7c995f973c54b0d026137615af28059890edb197";
-      sha256 = "c48acd2d4939ece0de7a2bae42f04e2f247a087947b66da86b4fb96fb32330d9";
+      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
     };
     dependencies = [];
 
   };
   "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2014-10-27";
+    name = "WebAPI";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
       rev = "a7789abffe936db56e3152e23733847f94755753";
-      sha256 = "a5e9560b71b9e3c242c8623972f11a9298708e99f90b4f919610b0959417a767";
+      sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80";
     };
     dependencies = [];
 
@@ -800,63 +800,63 @@ rec {
 
   };
   "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2014-11-10";
+    name = "commentary";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
       rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
-      sha256 = "7f92a27f16f8a3a9285b14ca9dd9c7deb6cc7391075024446e5be395cca18c1e";
+      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
     };
     dependencies = [];
 
   };
   "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-2013-07-29";
+    name = "ctrlp";
     src = fetchgit {
       url = "git://github.com/kien/ctrlp.vim";
       rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
-      sha256 = "3736b2f152df20be0a0d5ed6a39929b2df1ed9bbe98f68d80db657c00f0dcb30";
+      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
     };
     dependencies = [];
 
   };
   "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-01-26";
+    name = "extradite";
     src = fetchgit {
       url = "git://github.com/int3/vim-extradite";
       rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
-      sha256 = "0f03c331bfa61292087ec403e5a9083f3dc03988b6d5cb6704934d2e6c646fdb";
+      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
     };
     dependencies = [];
 
   };
   "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-02-08";
+    name = "fugitive";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "eb8eb1850a47671a8a3639feab8b2a50577e4913";
-      sha256 = "d589245c1a9490a7c370ea80492a606fa207fac268a3c1bd5151fc3f326d3514";
+      rev = "933f6a1e1df549564062f936bd1c836d28cf1676";
+      sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908";
     };
     dependencies = [];
 
   };
   "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2014-10-19";
+    name = "ghcmod";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
       rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9";
-      sha256 = "b5a50bc1bcc0777def41cf7f18557f6674f709cbf22577ebe845ec1bb8e39e9d";
+      sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d";
     };
     dependencies = [];
 
   };
   "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "github-MarcWeber-vim-addon-vim2nix-2015-02-08";
+    name = "github-MarcWeber-vim-addon-vim2nix";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-vim2nix";
-      rev = "5507ee4db7599873d72fab035c752dea245e2cd4";
-      sha256 = "02094bd066f930469a2acebe93f960a4b57ee1e302fe2e80a87ef9e607791295";
-    };
-    dependencies = ["vim-addon-manager"];
+       rev = "5507ee4db7599873d72fab035c752dea245e2cd4";
+       sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx";
+     };
+     dependencies = ["vim-addon-manager"];
 
   };
   "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -881,401 +881,400 @@ rec {
   '';
   };
   "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2014-11-06";
+    name = "pathogen";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
       rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2";
-      sha256 = "9ccb1d234d9eb8bccc3a50ff6fadcc925644a0e17cd4444623d22843c5d82e80";
+      sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7";
     };
     dependencies = [];
 
   };
   "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "quickfixstatus-2011-09-02";
+    name = "quickfixstatus";
     src = fetchgit {
       url = "git://github.com/dannyob/quickfixstatus";
       rev = "fd3875b914fc51bbefefa8c4995588c088163053";
-      sha256 = "a7f15f5404bf0719c5c1eab9c117c3ca4302b0232f959b509c364f3869a2c9fd";
+      sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b";
     };
     dependencies = [];
 
   };
   "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow_parentheses-2013-03-04";
+    name = "rainbow_parentheses";
     src = fetchgit {
       url = "git://github.com/kien/rainbow_parentheses.vim";
       rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
-      sha256 = "6f467a4de21e26e7d50a74d9fd1503ea67d94bdd93fde19ed5da42552487957b";
+      sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3";
     };
     dependencies = [];
 
   };
   "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-2015-01-29";
+    name = "rust";
     src = fetchgit {
       url = "git://github.com/wting/rust.vim";
       rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376";
-      sha256 = "f7335d4265db4d0e030b6d1f23818710e8b80be4aeb42ebb60396d5327c6f669";
+      sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee";
     };
     dependencies = [];
 
   };
   "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2014-11-24";
+    name = "sensible";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
       rev = "b30dcf387af977acfa21732592bfca05598b2188";
-      sha256 = "8b2b22cd0dc766d4ecc3fc9f9ad21412b033ff02b6a3047a768da82773bb6bfe";
+      sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f";
     };
     dependencies = [];
-
   };
   "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2015-02-04";
+    name = "snipmate";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
       rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5";
-      sha256 = "7b4a730b557d4f0d117e8ad7529ff38f81d29986db6d4418c0ea39ff3c827e65";
+      sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sourcemap-2012-09-19";
+    name = "sourcemap";
     src = fetchgit {
       url = "git://github.com/chikatoike/sourcemap.vim";
       rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
-      sha256 = "95665edd31b4840728f6e1492ccf143d52079b2c1ce11407cf9936b03c9df23c";
+      sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd";
     };
     dependencies = [];
 
   };
   "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2015-02-08";
+    name = "surround";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
-      rev = "fd75eb2cb2ffe85a457445cb152d5a6c7acda140";
-      sha256 = "3322993b1c0aec299525d5d8120433b72a03e70cee573289639ed5675e33974e";
+      rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd";
+      sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269";
     };
     dependencies = [];
 
   };
   "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2015-01-11";
+    name = "table-mode";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
       rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9";
-      sha256 = "610bbcad80fc153e2d68745ad767205d906c08055e884b93b98a0e2aa947d4dd";
+      sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c";
     };
     dependencies = [];
 
   };
   "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-01-15";
+    name = "tlib";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
       rev = "9e629767e5a91ede057d07f8754326e68c92a692";
-      sha256 = "2c3c039175494fb3b2f5002194f3ee9f50dafc65c80bc5f3a07d9911aea52208";
+      sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6";
     };
     dependencies = [];
 
   };
   "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2015-01-29";
+    name = "undotree";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
       rev = "42000e2a7140843030f517de9d4923dd5fa40458";
-      sha256 = "8a340bce79409b1f6c88c8c9310fd9d9eb97bba23c5208f66715e5a008cb0cba";
+      sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293";
     };
     dependencies = [];
 
   };
   "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2014-09-22";
+    name = "vim-addon-actions";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
       rev = "a5d20500fb8812958540cf17862bd73e7af64936";
-      sha256 = "4a6d9e25b69cf458980e0b2acabc5b87e1e0d763f357fbeaee1e859b2f3d9069";
+      sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2013-10-18";
+    name = "vim-addon-async";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
       rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c";
-      sha256 = "ff9c7ce533dd2d0c2cabcd507f22c27b8507b03f58dfe30158304dca77133730";
+      sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07";
     };
     dependencies = ["vim-addon-signs"];
 
   };
   "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-background-cmd-2015-01-05";
+    name = "vim-addon-background-cmd";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-background-cmd";
       rev = "e99076519139b959edce0581b0f31207a5ec7c64";
-      sha256 = "54872b6f636994a3057c0fcda3e6e540684205cf2d08a41778bcfbdd6d0a57a2";
+      sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb";
     };
     dependencies = ["vim-addon-mw-utils"];
 
   };
   "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-commenting-2013-06-10";
+    name = "vim-addon-commenting";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-commenting";
       rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
-      sha256 = "f0ce6072dd607c7fe3a337903d49d19bf90bc59d302977cc30dd26696cd723a9";
+      sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e";
     };
     dependencies = [];
 
   };
   "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-completion-2015-02-10";
+    name = "vim-addon-completion";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-completion";
-      rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
-      sha256 = "177738cbe3ab6083517e211c8aa8e6235beafb518a7e8b87922a675dbbed5b5b";
+      rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435";
+      sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859";
     };
     dependencies = ["tlib"];
 
   };
   "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-errorformats-2014-11-05";
+    name = "vim-addon-errorformats";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-errorformats";
       rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "59a7abe3d6be8e579737c7c614a5cb148df14cc1dcea3d711acb115190cb31b3";
+      sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95";
     };
     dependencies = [];
 
   };
   "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-goto-thing-at-cursor-2012-01-11";
+    name = "vim-addon-goto-thing-at-cursor";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
       rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "a91752a43042086448246777cd9dc2fa7f5f8f54ef052148acfa51c05f58281e";
+      sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea";
     };
     dependencies = ["tlib"];
 
   };
   "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-local-vimrc-2014-02-14";
+    name = "vim-addon-local-vimrc";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
       rev = "7689b55ee86dd6046923fd28ceab49da3881abfe";
-      sha256 = "b496281c8b0dd4c7aada20789a6a3a6b6d1d2741d19b0a690d09bf121d0f40d8";
+      sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556";
     };
     dependencies = [];
 
   };
   "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2014-12-03";
+    name = "vim-addon-manager";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
       rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07";
-      sha256 = "6cff7636e5939931a1f152fe635319028fb92d88483789d737e89ef2d73ea16f";
+      sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3";
     };
     dependencies = [];
 
   };
   "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mru-2013-08-08";
+    name = "vim-addon-mru";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mru";
       rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
-      sha256 = "b00f609e5e043171b2be729bbc7b5094678fdfe7de97a1b34bf9855bec7d75f8";
+      sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960";
     };
     dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
   "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2012-11-05";
+    name = "vim-addon-mw-utils";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
       rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "7ba038830b6f6c60a93d3dc8e60755a3728ddc8414e9d8c0089d5b530eb848e7";
+      sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c";
     };
     dependencies = [];
 
   };
   "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-nix-2014-11-05";
+    name = "vim-addon-nix";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
       rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8";
-      sha256 = "db4c397ae56f81f600e67549c76a879901d6084246b34751526a9e39f3f720c1";
+      sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410";
     };
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-other-2014-07-15";
+    name = "vim-addon-other";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-other";
       rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "ec0b80acd31bac66bb1fc72bfc960f2a89b156d6ecd0a620c143bde8fbfe1e21";
+      sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b";
     };
     dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
   };
   "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-php-manual-2015-01-01";
+    name = "vim-addon-php-manual";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-php-manual";
       rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
-      sha256 = "d127d274bd37c1ad4deae4e988403f987cb11c0a8d7f7d729bf1fcf282a33add";
+      sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd";
     };
     dependencies = [];
 
   };
   "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-signs-2013-04-19";
+    name = "vim-addon-signs";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-signs";
       rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "27035d6d8eace02be4a5585100372a709d7a582ea66b56a1c282ee5041e1fc70";
+      sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8";
     };
     dependencies = [];
 
   };
   "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2014-01-18";
+    name = "vim-addon-sql";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
       rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
-      sha256 = "0d5cb4e6fa829a39cf8ba537a463aece768619ce8bcbb8693a4c348fa64541ca";
+      sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2";
     };
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
   };
   "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-syntax-checker-2013-07-12";
+    name = "vim-addon-syntax-checker";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
       rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
-      sha256 = "530f1d69e8ebae201c07b38e50ebfadbae60649d4a73977c124cd3f1378d659f";
+      sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-toggle-buffer-2012-01-13";
+    name = "vim-addon-toggle-buffer";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
       rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "c258c941e75f09474d27ebeb859438565e3e237873fa71d1abfc75f8dfaee963";
+      sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
   "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-xdebug-2014-08-29";
+    name = "vim-addon-xdebug";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-xdebug";
       rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
-      sha256 = "ebf61896e9b32eeeb0553124cc0011aee7d779307a32771c3ecb7181951d479a";
+      sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef";
     };
     dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
   "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-02-13";
+    name = "vim-airline";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "ca925efdbfe88b03597efc7caee4ee8762a2cfe0";
-      sha256 = "47def66ab083fb847c8ee40e0a23bf6d69cdcc7919c869089542381c8319c972";
+      rev = "446397e006d8cba9e1ac38d8c656ba39218c139b";
+      sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119";
     };
     dependencies = [];
 
   };
   "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2014-10-10";
+    name = "vim-coffee-script";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
       rev = "827e4a38b07479433b619091469a7495a392df8a";
-      sha256 = "ca93ff77aab2c5f0b855afa60b26fce355f74684e8de27e76d2d22eda3e75904";
+      sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0";
     };
     dependencies = [];
 
   };
   "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2014-12-14";
+    name = "vim-easy-align";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
       rev = "c62d124be614de65922b15d468c4049d1eee9353";
-      sha256 = "733dbf6c4d1a29957451d64c7cf431f877e5abefcee19017742b4d5e8d60165b";
+      sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee";
     };
     dependencies = [];
 
   };
   "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-02-11";
+    name = "vim-gitgutter";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "061258e04476c0f9f653a969e640bf03b3659594";
-      sha256 = "535643c8e958d7c020ef0c39aadb5c6a7f3bad8895213bc0f6774c12e2627ac3";
+      rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd";
+      sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d";
     };
     dependencies = [];
 
   };
   "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-iced-coffee-script-2013-12-27";
+    name = "vim-iced-coffee-script";
     src = fetchgit {
       url = "git://github.com/noc7c9/vim-iced-coffee-script";
       rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
-      sha256 = "631786c89ebcd630788f2c7201b3f2503e0106eef4e3d9d808e91946f7778c08";
+      sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93";
     };
     dependencies = [];
 
   };
   "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2013-11-25";
+    name = "vim-latex-live-preview";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
       rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
-      sha256 = "c129e9360f0c3c616a26ea74cfde03c70cfae16f9e1eeb89cfbcfc16beb3b5b9";
+      sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722";
     };
     dependencies = [];
 
   };
   "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-01-12";
+    name = "vim-signature";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
       rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45";
-      sha256 = "606e2b1dc19c0e9c7301e0c9a6ff07cd7cefe057f3a5ac17536735dcb1a03e06";
+      sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675";
     };
     dependencies = [];
 
   };
   "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-02-17";
+    name = "vim-snippets";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "93b4de1299916de0d93d70629f86ff0fa9735061";
-      sha256 = "82a909f180ea11959d20f838a2716ff188bdec9f5ea2406ccd4fa27388462cf6";
+      rev = "27906a3754f0ac292d0915a4075bff22db53fa3e";
+      sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6";
     };
     dependencies = [];
 
   };
   "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim2hs-2014-04-16";
+    name = "vim2hs";
     src = fetchgit {
       url = "git://github.com/dag/vim2hs";
       rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "1c8120a530a29047a8034dc7b381a53f41b0d827d90ea496736b97b65a6b01f5";
+      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
     };
     dependencies = [];
 
   };
   "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2014-07-18";
+    name = "vundle";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
       rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
-      sha256 = "95b9b4b8bb76fa60f2a26ef48c3801385051bcb5b2f591d548dc45284b3ab79e";
+      sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
     };
     dependencies = [];
 
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index b8a67b87a804..77f55d07faf3 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 let
-  version = "17657c35869baa999b454e868cd3d5a7e1656425";
+  version = "4517261caab34742afdeaf0c36128b9579675717";
   shortVersion = stdenv.lib.substring 0 7 version;
 in
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     rev = version;
-    sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb";
+    sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c";
   };
 
   preInstall = ''
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 404d785146c3..718a9672c90d 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name    = "gradm-${version}";
-  version = "3.0-201408301734";
+  version = "3.1-201502222102";
 
   src  = fetchurl {
     url    = "http://grsecurity.net/stable/${name}.tar.gz";
-    sha256 = "171i1jyw82dnv2fi4dnh40dw1wa5hrllnpjf181cafnzxjpyb45i";
+    sha256 = "1dvzjjyq8phhjcm425j9hw0m0azg34lm02p0yn058jiipx731xrp";
   };
 
   buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 72ca1a0bb315..76918d0c488a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -18,7 +18,7 @@ let
       };
     };
 
-  grsecPatch = { grversion ? "3.0", kversion, revision, branch, sha256 }:
+  grsecPatch = { grversion ? "3.1", kversion, revision, branch, sha256 }:
     { name = "grsecurity-${grversion}-${kversion}";
       inherit grversion kversion revision;
       patch = fetchurl {
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.33";
-      revision  = "201502200812";
+      revision  = "201502222137";
       branch    = "stable";
-      sha256    = "1dydrphgz8sfjf7w8b0kqai9k1dld6jv6frhqs6gqjj06wbg1rwd";
+      sha256    = "1mzw5g4m5yxs0qzrx2am5s19zggn4n9pws8vsqq82dhawmwcbbq2";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.18.7";
-      revision  = "201502200813";
+      revision  = "201502222138";
       branch    = "test";
-      sha256    = "1svvy0sip6p3h8iqlw0rh3lnxqziwz9fw8znyq1rw5cia89dx4c8";
+      sha256    = "0dnnwky9s8qhfm2b5zhl41m8br4qdxwmwwv8rbp11srydcz1pzib";
     };
 
   grsec_fix_path =
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 41523b931672..2b651841c488 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -36,6 +36,22 @@ installPhase() {
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
 
+    if test -z "$libsOnly"; then
+        # Install the X drivers.
+        mkdir -p $out/lib/xorg/modules
+        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
+        mkdir -p $out/lib/xorg/modules/drivers
+        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
+        mkdir -p $out/lib/xorg/modules/extensions
+        cp -p libglx.so.* $out/lib/xorg/modules/extensions
+
+        # Install the kernel module.
+        mkdir -p $out/lib/modules/$kernelVersion/misc
+        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
+        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
+    fi
+
+    # All libs except GUI-only are in $out now, so fixup them.
     for libname in `find "$out/lib/" -name '*.so.*'`
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
@@ -54,33 +70,7 @@ installPhase() {
 
 
     if test -z "$libsOnly"; then
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
-        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
-
-        #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-smi; do
-            cp $i $out/bin/$i
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-
-        patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
-
-        # Header files etc.
+        # Install headers and /share files etc.
         mkdir -p $out/include/nvidia
         cp -p *.h $out/include/nvidia
 
@@ -99,6 +89,18 @@ installPhase() {
             --replace '__UTILS_PATH__' $out/bin \
             --replace '__PIXMAP_PATH__' $out/share/pixmaps
 
+
+        # Install the programs.
+        mkdir -p $out/bin
+
+        for i in nvidia-settings nvidia-smi; do
+            cp $i $out/bin/$i
+            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+        done
+
+        patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
+
         # Test a bit.
         $out/bin/nvidia-settings --version
     else
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 17a38bf18017..43accf6a1fe7 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,16 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
-let
-  gitVersion = "7d2868d5fc88a4c30769b44f56a3a88a4277a9ab";
-in
-
 callPackage ./generic.nix (args // rec {
-  version = stdenv.lib.substring 0 7 gitVersion;
+  version = "2015-02-24";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = gitVersion;
-    sha256 = "1gf0x8d0zs2h3w910agxm4nb9qr4chs54iiblnqz4k74yyhbmwgg";
+    rev = "8bdcfb53966313e9ff747e3028390c207cfdbe9a";
+    sha256 = "0xcikjb57fz173sjh2wvv96ybvrsx9d24krq09wy9a4psxp7vr8f";
   };
 
   patches = [
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index afe4a8e127d6..f7e19a373049 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 , bundlerEnv }:
 
 let
-  version = "0.4.1";
+  version = "0.5.0";
   # `sass` et al
   gems = bundlerEnv {
     name = "consul-deps";
diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix
index 4faf1d3abc23..ad41dbb70a59 100644
--- a/pkgs/servers/consul/deps.nix
+++ b/pkgs/servers/consul/deps.nix
@@ -16,8 +16,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "consul-api";
-        rev = "1b81c8e0c4cbf1d382310e4c0dc11221632e79d1";
-        sha256 = "0fgawc1si0hn41kfr9sq351jccy8y5ac83l437vnshj60i9q9s6w";
+        rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c";
+        sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d";
       };
     }
     {
@@ -25,8 +25,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "go-metrics";
-        rev = "2b75159ce5d3641fb35b5a159cff309ac3cf4177";
-        sha256 = "1fjsa7r97zlpdzi5l7qvgyabznn5pm6bpwi1rgrwaxh7gc3a28vi";
+        rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc";
+        sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc";
       };
     }
     {
@@ -34,8 +34,8 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "go-radix";
-        rev = "b045fc0ad3587e8620fb42a0dea882cf8c08aef9";
-        sha256 = "1p09dwhngaszbr9si68xl1la74i359l0wibhhirpxrc8q4pgjplx";
+        rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80";
+        sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1";
       };
     }
     {
@@ -43,8 +43,17 @@ let
       src = fetchFromGitHub {
         owner = "armon";
         repo = "gomdb";
-        rev = "a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8";
-        sha256 = "0hiw5qkkyfd22v291w7rbnlrb4kraqzbkjfx2dvl7rqchkb0hv68";
+        rev = "151f2e08ef45cb0e57d694b2562f351955dff572";
+        sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
+      };
+    }
+    {
+      root = "github.com/golang/protobuf";
+      src = fetchFromGitHub {
+        owner = "golang";
+        repo = "protobuf";
+        rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea";
+        sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2";
       };
     }
     {
@@ -52,8 +61,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "consul";
-        rev = "v0.4.1";
-        sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7";
+        rev = "a022dfcb32246274adc8fb383882353c056d1da3";
+        sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5";
       };
     }
     {
@@ -70,8 +79,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "consul-template";
-        rev = "v0.5.1";
-        sha256 = "1h8sqmzf73bn12bj1yqldp9gl46gz766c3zrymwgl8p0mb74dllf";
+        rev = "v0.7.0";
+        sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx";
       };
     }
     {
@@ -79,8 +88,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-checkpoint";
-        rev = "89ef2a697dd8cdb4623097d5bb9acdb19a470767";
-        sha256 = "0mfykh9jkh1m2zxlm2df4j5i6hd6iq1kc8afjladdhcqyrkwcch0";
+        rev = "88326f6851319068e7b34981032128c0b1a6524d";
+        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
       };
     }
     {
@@ -97,8 +106,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-syslog";
-        rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c";
-        sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
+        rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
+        sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
       };
     }
     {
@@ -106,8 +115,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "golang-lru";
-        rev = "253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116";
-        sha256 = "01vdya86x4fylzwapnz6p3wkb8y17sfvbss656sixc37iirrhqr2";
+        rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4";
+        sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c";
       };
     }
     {
@@ -115,8 +124,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "hcl";
-        rev = "e51eabcdf801f663738fa12f4340fbad13062738";
-        sha256 = "09d047lg6py9waqd6zwb0c9id8hya4xv2cg7yi9jbx8kwq31s75l";
+        rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84";
+        sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c";
       };
     }
     {
@@ -133,8 +142,17 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "memberlist";
-        rev = "16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8";
-        sha256 = "0xagvyyfl37r0n6s67m1dmrahaxf4gprnfkm12x9jcpp5rbq7jjq";
+        rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab";
+        sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4";
+      };
+    }
+    {
+      root = "github.com/hashicorp/net-rpc-msgpackrpc";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "net-rpc-msgpackrpc";
+        rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2";
+        sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969";
       };
     }
     {
@@ -142,8 +160,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "raft";
-        rev = "cc9710ab540985954a67c108f414aa3152f5916f";
-        sha256 = "1v4hib68gaicaqcx3iyclxbp5p3g750rayh8f35sh5fwbklqw1qi";
+        rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab";
+        sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai";
       };
     }
     {
@@ -151,8 +169,17 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "raft-mdb";
-        rev = "6f52d0ce62a34e3f5bd29aa4d7068030d700d94a";
-        sha256 = "0pchi88ib7nzz6rdc91dpxq1k3q2021m8245v0yqh0ilbvvvyj7i";
+        rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0";
+        sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i";
+      };
+    }
+    {
+      root = "github.com/hashicorp/scada-client";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "scada-client";
+        rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
+        sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b";
       };
     }
     {
@@ -160,8 +187,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "serf";
-        rev = "v0.6.3";
-        sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+        rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de";
+        sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b";
       };
     }
     {
@@ -169,8 +196,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "terraform";
-        rev = "v0.3.1";
-        sha256 = "0z6r9dbqrzxaw4b1vbr14ci85jgz6qrq8p36ylcyabzfvwbxrl1m";
+        rev = "v0.3.7";
+        sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z";
       };
     }
     {
@@ -178,8 +205,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "yamux";
-        rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000";
-        sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan";
+        rev = "b4f943b3f25da97dec8e26bee1c3269019de070d";
+        sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz";
       };
     }
     {
@@ -191,13 +218,22 @@ let
         sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
       };
     }
+    {
+      root = "github.com/matttproud/golang_protobuf_extensions";
+      src = fetchFromGitHub {
+        owner = "matttproud";
+        repo = "golang_protobuf_extensions";
+        rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c";
+        sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936";
+      };
+    }
     {
       root = "github.com/miekg/dns";
       src = fetchFromGitHub {
         owner = "miekg";
         repo = "dns";
-        rev = "dc30c7cd4ed2fc8af73d49da4ee285404958b8bd";
-        sha256 = "1pqdgjz0qwbbfgya2brsvhj88jp6rmprjwzgjsjnnv9nxwfsbb5s";
+        rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d";
+        sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn";
       };
     }
     {
@@ -214,8 +250,35 @@ let
       src = fetchFromGitHub {
         owner = "mitchellh";
         repo = "mapstructure";
-        rev = "740c764bc6149d3f1806231418adb9f52c11bcbf";
-        sha256 = "0rlz93rmz465nr0wmzvq1n58yc0qdw7v1chr6zmj9jj9pix0a7cb";
+        rev = "442e588f213303bec7936deba67901f8fc8f18b1";
+        sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd";
+      };
+    }
+    {
+      root = "github.com/prometheus/client_golang";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "client_golang";
+        rev = "0.2.0";
+        sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250";
+      };
+    }
+    {
+      root = "github.com/prometheus/client_model";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "client_model";
+        rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+        sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+      };
+    }
+    {
+      root = "github.com/prometheus/procfs";
+      src = fetchFromGitHub {
+        owner = "prometheus";
+        repo = "procfs";
+        rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8";
+        sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i";
       };
     }
     {
@@ -232,8 +295,8 @@ let
       src = fetchFromGitHub {
         owner = "ugorji";
         repo = "go";
-        rev = "a7f0616e8cd41d08149bec05c87524abe4e0520e";
-        sha256 = "1sxbsvfb46gp6jpb8wy9z6329g2zzbm07xnzml627dsvwdcxvy4q";
+        rev = "c8676e5e9db1226325ca0ed7771633fb0109878b";
+        sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084";
       };
     }
   ];
diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix
index 2b44fc8b8a6f..5585dc4d89ec 100644
--- a/pkgs/servers/consul/template.nix
+++ b/pkgs/servers/consul/template.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "consul-template-${version}";
-  version = "0.5.1";
+  version = "0.7.0";
 
   src = import ./deps.nix {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Generic template rendering and notifications with Consul";
     homepage = https://github.com/hashicorp/consul-template;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh wkennington ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index e164c21ec78d..cb550652b785 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.10";
+  version = "2.4.12";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p";
+    sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
   };
 
   buildInputs = [perl] ++
diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
index 6d2f5ed91ca4..635861ab9efa 100644
--- a/pkgs/servers/nosql/cassandra/default.nix
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -8,13 +8,13 @@
 , getopt
 }:
 
-let version = "2.1.2";
+let version = "2.1.3";
 in stdenv.mkDerivation rec {
   name = "cassandra-${version}";
 
   src = fetchurl {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
-    sha256 = "1glpv3d1c63ccqnfjzz76cxb508qyvbgva26h5j7k8dd5av84lcr";
+    sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix
index ad8a6de6729b..e2818a1f6484 100644
--- a/pkgs/servers/samba/3.x.nix
+++ b/pkgs/servers/samba/3.x.nix
@@ -18,11 +18,11 @@
 assert useKerberos -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.24";
+  name = "samba-3.6.25";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i";
+    sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g";
   };
 
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index c290f75cd0dc..eca6c31478f9 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -31,11 +31,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "samba-4.1.16";
+  name = "samba-4.1.17";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0yx840qg5q6syq81439v3pbwawacm7nwnnvph85za9gsgcb9r80j";
+    sha256 = "07fban97xmf4r5y48jp6ajfdki6vx4239lwq9gmvwjy8x44mvsvs";
   };
 
   patches = [ ./4.x-no-persistent-install.patch ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c91f0c32c3cd..3701bdc461f0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -241,7 +241,7 @@ in
   };
 
   xkbcomp = attrs: attrs // {
-    NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
+    configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; 
   };
 
   xkeyboardconfig = attrs: attrs // {
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 2502882123eb..89c8c6ee2852 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,10 +50,10 @@ rec {
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
     xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=
-    export SDKROOT_X=/ # FIXME: impure!
-    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT_X/usr/include -F$SDKROOT_X/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
-    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT_X/usr/lib"
+    # Use the SDK from Xcode by default, falling back to /usr/{lib,include}.
+    export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || echo /)
+    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
+    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
     export CMAKE_OSX_ARCHITECTURES=x86_64
   '';
 
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index b54f342b3454..1bdf363300b6 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
     patchShebangs ./
   '';
 
+  # Explicit --docdir= is required for on-line help to work:
+  configureFlags = [ "--docdir=$out/share/doc" ];
+
   buildInputs = [
     pkgconfig which gettext intltool
     glib gtk2
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 59f2f5d05eec..53b650405fe8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150122";
+  name = "parallel-20150222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "14g9pka59vln19rg6y8lyvrsc4nb3jk8y26hv3hdrf44rgwpds7d";
+    sha256 = "1302snh0aac8978842ci1rvjjjwki7xgj8bd4hq3f2hxp3zdspv7";
   };
 
   patchPhase =
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index d235c241a058..73359cb36a9b 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.18.9";
+  version = "1.18.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "1cn4g4mcrnw67y23970a9bngl8nf2x9hh82lc59gz3xyxn8wljz2";
+    sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5";
   };
 
   buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index 6c090a7ec1f6..be87f383c0a2 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -1,11 +1,13 @@
-{stdenv, fetchurl, openssl, libpcap}:
+{stdenv, fetchFromGitHub, openssl, libpcap}:
 
 stdenv.mkDerivation rec {
   name = "bully-${version}";
   version = "1.0-22";
-  src = fetchurl {
-    url = "https://github.com/bdpurcell/bully/archive/v${version}.tar.gz";
-    sha256 = "72f568f659fdcf70455a17f91f25dde65a53431c67c796517d3d3c4a4703ab68";
+  src = fetchFromGitHub {
+    sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y";
+    rev = "v${version}";
+    repo = "bully";
+    owner = "Lrs121";
   };
   buildInputs = [ openssl libpcap ];
 
@@ -21,8 +23,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point";
-    homepage = https://github.com/bdpurcell/bully;
+    homepage = https://github.com/Lrs121/bully;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.gpl3;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index c5cefb7a7cea..aee26c63bb3f 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -3,11 +3,12 @@
 stdenv.mkDerivation rec {
 
   name = "i2pd-${version}";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
+    name = "i2pd-src-${version}.tar.gz";
     url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz";
-    sha256 = "1fic1jxdr48b0jfaamwbfkldbfi7awfbrqga2k7gvpncq32v0aj6";
+    sha256 = "1vw6s480lmxwhq0rx6d2lczb6d2j9f68hmv3ri9jwgp7bicy6ziz";
   };
 
   buildInputs = [ boost cryptopp ];
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 39f7b3052e0e..23c484e94798 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, geoip, getopt, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.97.4";
+  version = "0.98.0";
   name = "ipv6calc-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${name}.tar.gz";
-    sha256 = "0ffzqflvm6pfzgjsr3mzq7pwvshhl3h92rg4waza7zyvby4rwb7d";
+    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
+    sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd";
   };
 
   buildInputs = [ geoip getopt openssl perl ];
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index f59e32853437..5bf9754775aa 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.21b";
+  version = "1.49b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1j3857947lyr0j6jjdrx1mrdqpgi7fnfysxlycxb61xyg4av0k30";
+    sha256 = "14mbfdg78p80517zirvcsc2l2fbxn7n3j9zyfq8cn9dr2qi9icpq";
   };
 
   buildPhase   = "make PREFIX=$out";
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 783bd1ad7ff3..0d9ec8767209 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -3,20 +3,20 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.11p2";
+  name = "sudo-1.8.12";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1bd1zf85q15z015268w9vchzwypzalc3v2dnddmwy67s32a88cw1";
+    sha256 = "1c7kqhyps5hw38vl7a50f8gqz57mc4npi9l1clkikbg83n252fqn";
   };
 
   configureFlags = [
     "--with-env-editor"
     "--with-editor=/run/current-system/sw/bin/nano"
-    "--with-rundir=/run"
+    "--with-rundir=/run/sudo"
     "--with-vardir=/var/db/sudo"
     "--with-logpath=/var/log/sudo.log"
     "--with-sendmail=${sendmailPath}"
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index b5380d083cfe..d7220e062a64 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-let version = "0.03.18"; in
+let version = "0.03.19"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0v71h92zfr0n53ws413r4mn9xhh8mavcw9iwhdibxlsn33zhbb4p";
+    sha256 = "1icr9gk0zm2hhn19xg57x0509w4jz4mf72hsyy6nadzn9426ssaq";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bff0cc14972..70173068432e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1722,15 +1722,15 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs = callPackage ../development/web/nodejs { };
-  nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; };
+  nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
+  nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
 
   nodePackages = recurseIntoAttrs (
     callPackage ./node-packages.nix { self = nodePackages; }
   );
 
-  iojs = callPackage ../development/web/iojs { };
-  iojs-nightly = callPackage ../development/web/iojs { nightly = true; };
+  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
+  iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; };
 
   iojsPackages = recurseIntoAttrs (
     callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }
@@ -3863,6 +3863,11 @@ let
 
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
 
+    cstruct = callPackage ../development/ocaml-modules/cstruct {
+      lwt = ocaml_lwt;
+      sexplib = ocaml_sexplib;
+    };
+
     csv = callPackage ../development/ocaml-modules/csv { };
 
     deriving = callPackage ../development/tools/ocaml/deriving { };
@@ -4373,7 +4378,6 @@ let
     glpk = null;
     suitesparse = null;
     jdk = null;
-    gnuplot = null;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13;
@@ -6344,7 +6348,9 @@ let
     inherit (gnome) gtkdoc;
   };
 
-  libinput = callPackage ../development/libraries/libinput { };
+  libinput = callPackage ../development/libraries/libinput {
+    graphviz = graphviz-nox;
+  };
 
   libiptcdata = callPackage ../development/libraries/libiptcdata { };
 
@@ -6933,7 +6939,10 @@ let
 
   opal = callPackage ../development/libraries/opal {};
 
-  openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
+  openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
+  openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { };
+  openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
+  openjpeg = openjpeg_2_1;
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {
     giflib = giflib_4_1;
@@ -8497,7 +8506,7 @@ let
     cmdline = callPackage ../os-specific/darwin/command-line-tools {};
     apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; };
   in apple-source-releases // rec {
-    cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { 
+    cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
       cross = assert crossSystem != null; crossSystem;
       inherit maloader;
       xctoolchain = xcode.toolchain;
@@ -8975,6 +8984,8 @@ let
 
   libraw1394 = callPackage ../development/libraries/libraw1394 { };
 
+  libsass = callPackage ../development/libraries/libsass { };
+
   libsexy = callPackage ../development/libraries/libsexy { };
 
   libsepol = callPackage ../os-specific/linux/libsepol { };
@@ -9931,6 +9942,8 @@ let
 
   ed = callPackage ../applications/editors/ed { };
 
+  edbrowse = callPackage ../applications/editors/edbrowse { };
+
   ekho = callPackage ../applications/audio/ekho { };
 
   electrum = callPackage ../applications/misc/electrum { };
@@ -10053,8 +10066,6 @@ let
 
     magit = callPackage ../applications/editors/emacs-modes/magit { };
 
-    marathon = callPackage ../applications/networking/cluster/marathon { };
-
     maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
 
     metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
@@ -10375,7 +10386,7 @@ let
     libart = gnome2.libart_lgpl;
   }; # latest version: gnome3.goffice
 
-  idea = recurseIntoAttrs (callPackage ../applications/editors/idea { });
+  idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
@@ -10772,6 +10783,8 @@ let
 
   makeself = callPackage ../applications/misc/makeself { };
 
+  marathon = callPackage ../applications/networking/cluster/marathon { };
+
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
   mcpp = callPackage ../development/compilers/mcpp { };
@@ -10989,7 +11002,9 @@ let
     lua = lua5;
  };
 
-  mupdf = callPackage ../applications/misc/mupdf { };
+  mupdf = callPackage ../applications/misc/mupdf {
+    openjpeg = openjpeg_2_0_1;
+  };
 
   mypaint = callPackage ../applications/graphics/mypaint { };
 
@@ -11368,7 +11383,9 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = callPackage ../applications/networking/dropbox { };
+  dropbox = callPackage ../applications/networking/dropbox {
+    qt5 = qt54;
+  };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
@@ -12030,6 +12047,8 @@ let
 
   xkb_switch = callPackage ../tools/X11/xkb-switch { };
 
+  xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
+
   xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
     ghcWithPackages = haskellngPackages.ghcWithPackages;
     packages = self: [];
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index f2caede41d5c..25c790b8f3dd 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -118,6 +118,29 @@ let
     };
   };
 
+  lpty = buildLuaPackage rec {
+    name = "lpty-${version}";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "http://www.tset.de/downloads/lpty-1.1-1.tar.gz";
+      sha256 = "0d4ffda654dcf37dd8c99bcd100d0ee0dde7782cbd0ba9200ef8711c5cab02f1";
+    };
+    meta = {
+      homepage = "http://www.tset.de/lpty";
+      hydraPlatforms = stdenv.lib.platforms.linux;
+      license = stdenv.lib.licenses.mit;
+    };
+    preBuild = ''
+      makeFlagsArray=(
+        INST_LIBDIR="$out/lib/lua/${lua.luaversion}"
+        INST_LUADIR="$out/share/lua/${lua.luaversion}"
+        LUA_BINDIR="${lua}/bin"
+        LUA_INCDIR="-I${lua}/include"
+        LUA_LIBDIR="-L${lua}/lib"
+        );
+    '';
+  };
+
   luasec = buildLuaPackage rec {
     version = "0.5";
     name = "sec-${version}";
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4b96ca505ca4..dd0614b3145d 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -5,6 +5,7 @@
     self.by-version."7f"."1.1.3";
   by-version."7f"."1.1.3" = self.buildNodePackage {
     name = "7f-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz";
@@ -14,13 +15,18 @@
     deps = {
       "bits-0.1.1" = self.by-version."bits"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "7f" = self.by-version."7f"."1.1.3";
   by-spec."Base64"."~0.2.0" =
     self.by-version."Base64"."0.2.1";
   by-version."Base64"."0.2.1" = self.buildNodePackage {
     name = "Base64-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
@@ -29,12 +35,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."CSSselect"."~0.4.0" =
     self.by-version."CSSselect"."0.4.1";
   by-version."CSSselect"."0.4.1" = self.buildNodePackage {
     name = "CSSselect-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
@@ -45,12 +56,17 @@
       "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
       "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."CSSwhat"."0.4" =
     self.by-version."CSSwhat"."0.4.7";
   by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
     name = "CSSwhat-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
@@ -59,12 +75,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."JSONPath"."^0.10.0" =
     self.by-version."JSONPath"."0.10.0";
   by-version."JSONPath"."0.10.0" = self.buildNodePackage {
     name = "JSONPath-0.10.0";
+    version = "0.10.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/JSONPath/-/JSONPath-0.10.0.tgz";
@@ -72,14 +93,40 @@
       sha1 = "44959bdd94e3641858e7f2147d93c732f3505b1c";
     };
     deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."JSONStream"."~0.10.0" =
+    self.by-version."JSONStream"."0.10.0";
+  by-version."JSONStream"."0.10.0" = self.buildNodePackage {
+    name = "JSONStream-0.10.0";
+    version = "0.10.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz";
+      name = "JSONStream-0.10.0.tgz";
+      sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0";
+    };
+    deps = {
+      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
+      "through-2.3.6" = self.by-version."through"."2.3.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."JSONStream"."~0.6.4" =
     self.by-version."JSONStream"."0.6.4";
   by-version."JSONStream"."0.6.4" = self.buildNodePackage {
     name = "JSONStream-0.6.4";
+    version = "0.6.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
@@ -90,12 +137,17 @@
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.2.7" = self.by-version."through"."2.2.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."JSONStream"."~0.7.1" =
     self.by-version."JSONStream"."0.7.4";
   by-version."JSONStream"."0.7.4" = self.buildNodePackage {
     name = "JSONStream-0.7.4";
+    version = "0.7.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
@@ -106,12 +158,17 @@
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."JSONStream"."~0.8.3" =
     self.by-version."JSONStream"."0.8.4";
   by-version."JSONStream"."0.8.4" = self.buildNodePackage {
     name = "JSONStream-0.8.4";
+    version = "0.8.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
@@ -122,7 +179,11 @@
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."JSONStream"."~0.8.4" =
     self.by-version."JSONStream"."0.8.4";
@@ -130,6 +191,7 @@
     self.by-version."abbrev"."1.0.5";
   by-version."abbrev"."1.0.5" = self.buildNodePackage {
     name = "abbrev-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
@@ -138,7 +200,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."abbrev"."1.0.x" =
     self.by-version."abbrev"."1.0.5";
@@ -150,6 +216,7 @@
     self.by-version."accepts"."1.0.7";
   by-version."accepts"."1.0.7" = self.buildNodePackage {
     name = "accepts-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
@@ -160,7 +227,11 @@
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."accepts"."~1.0.7" =
     self.by-version."accepts"."1.0.7";
@@ -168,6 +239,7 @@
     self.by-version."accepts"."1.1.4";
   by-version."accepts"."1.1.4" = self.buildNodePackage {
     name = "accepts-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
@@ -178,7 +250,11 @@
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
       "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."accepts"."~1.1.2" =
     self.by-version."accepts"."1.1.4";
@@ -186,10 +262,11 @@
     self.by-version."accepts"."1.1.4";
   by-spec."accepts"."~1.1.4" =
     self.by-version."accepts"."1.1.4";
-  by-spec."accepts"."~1.2.3" =
+  by-spec."accepts"."~1.2.4" =
     self.by-version."accepts"."1.2.4";
   by-version."accepts"."1.2.4" = self.buildNodePackage {
     name = "accepts-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/accepts/-/accepts-1.2.4.tgz";
@@ -200,14 +277,17 @@
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
       "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."accepts"."~1.2.4" =
-    self.by-version."accepts"."1.2.4";
   by-spec."acorn"."^0.11.0" =
     self.by-version."acorn"."0.11.0";
   by-version."acorn"."0.11.0" = self.buildNodePackage {
     name = "acorn-0.11.0";
+    version = "0.11.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz";
@@ -216,12 +296,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."acorn"."~0.9.0" =
     self.by-version."acorn"."0.9.0";
   by-version."acorn"."0.9.0" = self.buildNodePackage {
     name = "acorn-0.9.0";
+    version = "0.9.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz";
@@ -230,12 +315,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."acorn-globals"."^1.0.0" =
     self.by-version."acorn-globals"."1.0.2";
   by-version."acorn-globals"."1.0.2" = self.buildNodePackage {
     name = "acorn-globals-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz";
@@ -245,7 +335,11 @@
     deps = {
       "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."acorn-globals"."^1.0.1" =
     self.by-version."acorn-globals"."1.0.2";
@@ -253,6 +347,7 @@
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = self.buildNodePackage {
     name = "active-x-obfuscator-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
@@ -262,12 +357,17 @@
     deps = {
       "zeparser-0.0.5" = self.by-version."zeparser"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.0" =
     self.by-version."addr-to-ip-port"."1.4.0";
   by-version."addr-to-ip-port"."1.4.0" = self.buildNodePackage {
     name = "addr-to-ip-port-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz";
@@ -276,14 +376,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.1" =
     self.by-version."addr-to-ip-port"."1.4.0";
+  by-spec."addressparser"."^0.3.1" =
+    self.by-version."addressparser"."0.3.2";
+  by-version."addressparser"."0.3.2" = self.buildNodePackage {
+    name = "addressparser-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
+      name = "addressparser-0.3.2.tgz";
+      sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."addressparser"."~0.1.3" =
     self.by-version."addressparser"."0.1.3";
   by-version."addressparser"."0.1.3" = self.buildNodePackage {
     name = "addressparser-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
@@ -292,26 +416,19 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."addressparser"."~0.2.1" =
-    self.by-version."addressparser"."0.2.1";
-  by-version."addressparser"."0.2.1" = self.buildNodePackage {
-    name = "addressparser-0.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
-      name = "addressparser-0.2.1.tgz";
-      sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."addressparser"."~0.3.2" =
+    self.by-version."addressparser"."0.3.2";
   by-spec."adm-zip"."0.4.4" =
     self.by-version."adm-zip"."0.4.4";
   by-version."adm-zip"."0.4.4" = self.buildNodePackage {
     name = "adm-zip-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
@@ -320,12 +437,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.7";
   by-version."adm-zip"."0.4.7" = self.buildNodePackage {
     name = "adm-zip-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
@@ -334,12 +456,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."adm-zip"."~0.4.4" =
+    self.by-version."adm-zip"."0.4.7";
   by-spec."after"."0.8.1" =
     self.by-version."after"."0.8.1";
   by-version."after"."0.8.1" = self.buildNodePackage {
     name = "after-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
@@ -348,12 +477,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."agent-base"."~1.0.1" =
     self.by-version."agent-base"."1.0.1";
   by-version."agent-base"."1.0.1" = self.buildNodePackage {
     name = "agent-base-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz";
@@ -362,31 +496,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."airplay-js"."^0.2.0" =
-    self.by-version."airplay-js"."0.2.11";
-  by-version."airplay-js"."0.2.11" = self.buildNodePackage {
-    name = "airplay-js-0.2.11";
+  by-spec."airplay-js"."^0.2.5" =
+    self.by-version."airplay-js"."0.2.12";
+  by-version."airplay-js"."0.2.12" = self.buildNodePackage {
+    name = "airplay-js-0.2.12";
+    version = "0.2.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.11.tgz";
-      name = "airplay-js-0.2.11.tgz";
-      sha1 = "276dc149bb5ce19d13632d7cab7afd4e759e37cc";
+      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.12.tgz";
+      name = "airplay-js-0.2.12.tgz";
+      sha1 = "fcc1ea106b5541982c34367ac674ce3bfa8a99ec";
     };
     deps = {
-      "asyncblock-2.1.24" = self.by-version."asyncblock"."2.1.24";
       "mdns-js-0.2.5" = self.by-version."mdns-js"."0.2.5";
       "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."airplay-js"."^0.2.5" =
-    self.by-version."airplay-js"."0.2.11";
   by-spec."alea"."~0.0.9" =
     self.by-version."alea"."0.0.9";
   by-version."alea"."0.0.9" = self.buildNodePackage {
     name = "alea-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/alea/-/alea-0.0.9.tgz";
@@ -395,12 +536,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."almond"."*" =
     self.by-version."almond"."0.3.0";
   by-version."almond"."0.3.0" = self.buildNodePackage {
     name = "almond-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz";
@@ -409,13 +555,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "almond" = self.by-version."almond"."0.3.0";
   by-spec."alter"."~0.2.0" =
     self.by-version."alter"."0.2.0";
   by-version."alter"."0.2.0" = self.buildNodePackage {
     name = "alter-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/alter/-/alter-0.2.0.tgz";
@@ -425,12 +576,17 @@
     deps = {
       "stable-0.1.5" = self.by-version."stable"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."amdefine"."*" =
     self.by-version."amdefine"."0.1.0";
   by-version."amdefine"."0.1.0" = self.buildNodePackage {
     name = "amdefine-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
@@ -439,7 +595,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "amdefine" = self.by-version."amdefine"."0.1.0";
   by-spec."amdefine".">=0.0.4" =
@@ -448,6 +608,7 @@
     self.by-version."amqp"."0.2.3";
   by-version."amqp"."0.2.3" = self.buildNodePackage {
     name = "amqp-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/amqp/-/amqp-0.2.3.tgz";
@@ -457,12 +618,17 @@
     deps = {
       "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansi"."^0.3.0" =
     self.by-version."ansi"."0.3.0";
   by-version."ansi"."0.3.0" = self.buildNodePackage {
     name = "ansi-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
@@ -471,14 +637,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansi"."~0.3.0" =
     self.by-version."ansi"."0.3.0";
+  by-spec."ansi-color"."0.2.1" =
+    self.by-version."ansi-color"."0.2.1";
+  by-version."ansi-color"."0.2.1" = self.buildNodePackage {
+    name = "ansi-color-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
+      name = "ansi-color-0.2.1.tgz";
+      sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ansi-regex"."^0.1.0" =
     self.by-version."ansi-regex"."0.1.0";
   by-version."ansi-regex"."0.1.0" = self.buildNodePackage {
     name = "ansi-regex-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
@@ -487,12 +677,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansi-regex"."^0.2.0" =
     self.by-version."ansi-regex"."0.2.1";
   by-version."ansi-regex"."0.2.1" = self.buildNodePackage {
     name = "ansi-regex-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
@@ -501,30 +696,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansi-regex"."^0.2.1" =
     self.by-version."ansi-regex"."0.2.1";
   by-spec."ansi-regex"."^1.0.0" =
-    self.by-version."ansi-regex"."1.1.0";
-  by-version."ansi-regex"."1.1.0" = self.buildNodePackage {
-    name = "ansi-regex-1.1.0";
+    self.by-version."ansi-regex"."1.1.1";
+  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
+    name = "ansi-regex-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz";
-      name = "ansi-regex-1.1.0.tgz";
-      sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357";
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+      name = "ansi-regex-1.1.1.tgz";
+      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansi-regex"."^1.1.0" =
-    self.by-version."ansi-regex"."1.1.0";
+    self.by-version."ansi-regex"."1.1.1";
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = self.buildNodePackage {
     name = "ansi-remover-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
@@ -533,13 +738,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "ansi-remover" = self.by-version."ansi-remover"."0.0.2";
   by-spec."ansi-styles"."^1.1.0" =
     self.by-version."ansi-styles"."1.1.0";
   by-version."ansi-styles"."1.1.0" = self.buildNodePackage {
     name = "ansi-styles-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
@@ -548,12 +758,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
   by-version."ansicolors"."0.3.2" = self.buildNodePackage {
     name = "ansicolors-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
@@ -562,12 +777,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ansistyles"."~0.1.3" =
     self.by-version."ansistyles"."0.1.3";
   by-version."ansistyles"."0.1.3" = self.buildNodePackage {
     name = "ansistyles-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
@@ -576,12 +796,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."anymatch"."^1.1.0" =
     self.by-version."anymatch"."1.1.0";
   by-version."anymatch"."1.1.0" = self.buildNodePackage {
     name = "anymatch-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/anymatch/-/anymatch-1.1.0.tgz";
@@ -591,12 +816,17 @@
     deps = {
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."apparatus".">= 0.0.6" =
     self.by-version."apparatus"."0.0.8";
   by-version."apparatus"."0.0.8" = self.buildNodePackage {
     name = "apparatus-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
@@ -606,12 +836,17 @@
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."archiver"."~0.12.0" =
     self.by-version."archiver"."0.12.0";
   by-version."archiver"."0.12.0" = self.buildNodePackage {
     name = "archiver-0.12.0";
+    version = "0.12.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz";
@@ -628,12 +863,17 @@
       "tar-stream-1.0.2" = self.by-version."tar-stream"."1.0.2";
       "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."archy"."0" =
     self.by-version."archy"."0.0.2";
   by-version."archy"."0.0.2" = self.buildNodePackage {
     name = "archy-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
@@ -642,7 +882,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."archy"."0.0.2" =
     self.by-version."archy"."0.0.2";
@@ -650,6 +894,7 @@
     self.by-version."archy"."1.0.0";
   by-version."archy"."1.0.0" = self.buildNodePackage {
     name = "archy-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
@@ -658,7 +903,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."archy"."~1.0.0" =
     self.by-version."archy"."1.0.0";
@@ -666,6 +915,7 @@
     self.by-version."are-we-there-yet"."1.0.2";
   by-version."are-we-there-yet"."1.0.2" = self.buildNodePackage {
     name = "are-we-there-yet-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz";
@@ -675,12 +925,17 @@
     deps = {
       "delegates-0.1.0" = self.by-version."delegates"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
   by-version."argparse"."0.1.15" = self.buildNodePackage {
     name = "argparse-0.1.15";
+    version = "0.1.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
@@ -691,12 +946,17 @@
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.16";
   by-version."argparse"."0.1.16" = self.buildNodePackage {
     name = "argparse-0.1.16";
+    version = "0.1.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
@@ -707,12 +967,38 @@
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
       "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."argparse"."~ 1.0.0" =
+    self.by-version."argparse"."1.0.1";
+  by-version."argparse"."1.0.1" = self.buildNodePackage {
+    name = "argparse-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.1.tgz";
+      name = "argparse-1.0.1.tgz";
+      sha1 = "cb1010b8559920fc8aee521eb9e80e4851790923";
+    };
+    deps = {
+      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-differ"."^1.0.0" =
     self.by-version."array-differ"."1.0.0";
   by-version."array-differ"."1.0.0" = self.buildNodePackage {
     name = "array-differ-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
@@ -721,12 +1007,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-filter"."~0.0.0" =
     self.by-version."array-filter"."0.0.1";
   by-version."array-filter"."0.0.1" = self.buildNodePackage {
     name = "array-filter-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
@@ -735,12 +1026,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-indexofobject"."~0.0.1" =
     self.by-version."array-indexofobject"."0.0.1";
   by-version."array-indexofobject"."0.0.1" = self.buildNodePackage {
     name = "array-indexofobject-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
@@ -749,12 +1045,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-loop"."^1.0.0" =
     self.by-version."array-loop"."1.0.0";
   by-version."array-loop"."1.0.0" = self.buildNodePackage {
     name = "array-loop-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz";
@@ -763,12 +1064,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-map"."~0.0.0" =
     self.by-version."array-map"."0.0.0";
   by-version."array-map"."0.0.0" = self.buildNodePackage {
     name = "array-map-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
@@ -777,12 +1083,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-reduce"."~0.0.0" =
     self.by-version."array-reduce"."0.0.0";
   by-version."array-reduce"."0.0.0" = self.buildNodePackage {
     name = "array-reduce-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
@@ -791,12 +1102,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."array-uniq"."^1.0.2" =
     self.by-version."array-uniq"."1.0.2";
   by-version."array-uniq"."1.0.2" = self.buildNodePackage {
     name = "array-uniq-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz";
@@ -805,12 +1121,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."arraybuffer.slice"."0.0.6" =
     self.by-version."arraybuffer.slice"."0.0.6";
   by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
     name = "arraybuffer.slice-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
@@ -819,12 +1140,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asap"."^1.0.0" =
     self.by-version."asap"."1.0.0";
   by-version."asap"."1.0.0" = self.buildNodePackage {
     name = "asap-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
@@ -833,12 +1159,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asap"."^2.0.0" =
     self.by-version."asap"."2.0.1";
   by-version."asap"."2.0.1" = self.buildNodePackage {
     name = "asap-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asap/-/asap-2.0.1.tgz";
@@ -847,7 +1178,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asap"."~1.0.0" =
     self.by-version."asap"."1.0.0";
@@ -855,6 +1190,7 @@
     self.by-version."ascii-json"."0.2.0";
   by-version."ascii-json"."0.2.0" = self.buildNodePackage {
     name = "ascii-json-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
@@ -863,12 +1199,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ascli"."~0.3" =
     self.by-version."ascli"."0.3.0";
   by-version."ascli"."0.3.0" = self.buildNodePackage {
     name = "ascli-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
@@ -879,12 +1220,17 @@
       "colour-0.7.1" = self.by-version."colour"."0.7.1";
       "optjs-3.2.1-boom" = self.by-version."optjs"."3.2.1-boom";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = self.buildNodePackage {
     name = "asn1-0.1.11";
+    version = "0.1.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
@@ -893,12 +1239,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asn1"."0.2.1" =
     self.by-version."asn1"."0.2.1";
   by-version."asn1"."0.2.1" = self.buildNodePackage {
     name = "asn1-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz";
@@ -907,12 +1258,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."asn1.js".">=1.0.0-0 >=1.0.0-0 <2.0.0-0" =
+  by-spec."asn1.js".">=1.0.0 >=1.0.0 <2.0.0" =
     self.by-version."asn1.js"."1.0.3";
   by-version."asn1.js"."1.0.3" = self.buildNodePackage {
     name = "asn1.js-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz";
@@ -922,9 +1278,13 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
+    };
+    optionalDependencies = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."asn1.js"."^1.0.0" =
     self.by-version."asn1.js"."1.0.3";
@@ -932,6 +1292,7 @@
     self.by-version."asn1.js-rfc3280"."1.0.0";
   by-version."asn1.js-rfc3280"."1.0.0" = self.buildNodePackage {
     name = "asn1.js-rfc3280-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz";
@@ -940,13 +1301,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."asn1.js"."1.0.3"];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert"."*" =
     self.by-version."assert"."1.3.0";
   by-version."assert"."1.3.0" = self.buildNodePackage {
     name = "assert-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
@@ -956,13 +1322,20 @@
     deps = {
       "util-0.10.3" = self.by-version."util"."0.10.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "assert" = self.by-version."assert"."1.3.0";
+  by-spec."assert"."^1.1.1" =
+    self.by-version."assert"."1.3.0";
   by-spec."assert"."~1.1.0" =
     self.by-version."assert"."1.1.2";
   by-version."assert"."1.1.2" = self.buildNodePackage {
     name = "assert-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz";
@@ -972,7 +1345,11 @@
     deps = {
       "util-0.10.3" = self.by-version."util"."0.10.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert"."~1.3.0" =
     self.by-version."assert"."1.3.0";
@@ -980,6 +1357,7 @@
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = self.buildNodePackage {
     name = "assert-plus-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
@@ -988,12 +1366,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert-plus"."0.1.3" =
     self.by-version."assert-plus"."0.1.3";
   by-version."assert-plus"."0.1.3" = self.buildNodePackage {
     name = "assert-plus-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
@@ -1002,12 +1385,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert-plus"."0.1.5" =
     self.by-version."assert-plus"."0.1.5";
   by-version."assert-plus"."0.1.5" = self.buildNodePackage {
     name = "assert-plus-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
@@ -1016,7 +1404,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert-plus"."^0.1.5" =
     self.by-version."assert-plus"."0.1.5";
@@ -1024,6 +1416,7 @@
     self.by-version."assertion-error"."1.0.0";
   by-version."assertion-error"."1.0.0" = self.buildNodePackage {
     name = "assertion-error-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
@@ -1032,12 +1425,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ast-traverse"."~0.1.1" =
     self.by-version."ast-traverse"."0.1.1";
   by-version."ast-traverse"."0.1.1" = self.buildNodePackage {
     name = "ast-traverse-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz";
@@ -1046,12 +1444,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ast-types"."~0.3.22" =
     self.by-version."ast-types"."0.3.38";
   by-version."ast-types"."0.3.38" = self.buildNodePackage {
     name = "ast-types-0.3.38";
+    version = "0.3.38";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ast-types/-/ast-types-0.3.38.tgz";
@@ -1061,41 +1464,38 @@
     deps = {
       "private-0.1.6" = self.by-version."private"."0.1.6";
     };
-    peerDependencies = [];
-  };
-  by-spec."ast-types"."~0.4.7" =
-    self.by-version."ast-types"."0.4.13";
-  by-version."ast-types"."0.4.13" = self.buildNodePackage {
-    name = "ast-types-0.4.13";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.4.13.tgz";
-      name = "ast-types-0.4.13.tgz";
-      sha1 = "445bd0b0f235028f5dc5b532fca27dc7b19ed754";
-    };
-    deps = {
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ast-types"."~0.6.1" =
-    self.by-version."ast-types"."0.6.12";
-  by-version."ast-types"."0.6.12" = self.buildNodePackage {
-    name = "ast-types-0.6.12";
+    self.by-version."ast-types"."0.6.14";
+  by-version."ast-types"."0.6.14" = self.buildNodePackage {
+    name = "ast-types-0.6.14";
+    version = "0.6.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.12.tgz";
-      name = "ast-types-0.6.12.tgz";
-      sha1 = "ea7e5b0750b6ebd9d3f492011c0f7e0c55e035b0";
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.14.tgz";
+      name = "ast-types-0.6.14.tgz";
+      sha1 = "ee2da2c2bdd4cb5c95d29c24d394f7a769a03efd";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."ast-types"."~0.6.12" =
+    self.by-version."ast-types"."0.6.14";
   by-spec."astw"."~0.0.0" =
     self.by-version."astw"."0.0.0";
   by-version."astw"."0.0.0" = self.buildNodePackage {
     name = "astw-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz";
@@ -1105,12 +1505,17 @@
     deps = {
       "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."astw"."~0.1.0" =
     self.by-version."astw"."0.1.0";
   by-version."astw"."0.1.0" = self.buildNodePackage {
     name = "astw-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
@@ -1120,12 +1525,17 @@
     deps = {
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."astw"."~1.1.0" =
     self.by-version."astw"."1.1.0";
   by-version."astw"."1.1.0" = self.buildNodePackage {
     name = "astw-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
@@ -1135,12 +1545,17 @@
     deps = {
       "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."*" =
     self.by-version."async"."0.9.0";
   by-version."async"."0.9.0" = self.buildNodePackage {
     name = "async-0.9.0";
+    version = "0.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
@@ -1149,13 +1564,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "async" = self.by-version."async"."0.9.0";
   by-spec."async"."0.1.18" =
     self.by-version."async"."0.1.18";
   by-version."async"."0.1.18" = self.buildNodePackage {
     name = "async-0.1.18";
+    version = "0.1.18";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.1.18.tgz";
@@ -1164,12 +1584,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."0.1.22" =
     self.by-version."async"."0.1.22";
   by-version."async"."0.1.22" = self.buildNodePackage {
     name = "async-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
@@ -1178,7 +1603,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."0.1.x" =
     self.by-version."async"."0.1.22";
@@ -1186,6 +1615,7 @@
     self.by-version."async"."0.2.9";
   by-version."async"."0.2.9" = self.buildNodePackage {
     name = "async-0.2.9";
+    version = "0.2.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
@@ -1194,12 +1624,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = self.buildNodePackage {
     name = "async-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
@@ -1208,7 +1643,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."0.9.0" =
     self.by-version."async"."0.9.0";
@@ -1240,6 +1679,7 @@
     self.by-version."async-each"."0.1.6";
   by-version."async-each"."0.1.6" = self.buildNodePackage {
     name = "async-each-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz";
@@ -1248,12 +1688,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."async-each"."~0.1.5" =
+    self.by-version."async-each"."0.1.6";
   by-spec."async-some"."~1.0.1" =
     self.by-version."async-some"."1.0.1";
   by-version."async-some"."1.0.1" = self.buildNodePackage {
     name = "async-some-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
@@ -1263,45 +1710,39 @@
     deps = {
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
     };
-    peerDependencies = [];
-  };
-  by-spec."asyncblock"."^2.1.23" =
-    self.by-version."asyncblock"."2.1.24";
-  by-version."asyncblock"."2.1.24" = self.buildNodePackage {
-    name = "asyncblock-2.1.24";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/asyncblock/-/asyncblock-2.1.24.tgz";
-      name = "asyncblock-2.1.24.tgz";
-      sha1 = "8f5c5f95cf5d1b50fead4595ae596f40f2c8d255";
-    };
-    deps = {
-      "fibers-1.0.5" = self.by-version."fibers"."1.0.5";
-      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.1.12";
-  by-version."aws-sdk"."2.1.12" = self.buildNodePackage {
-    name = "aws-sdk-2.1.12";
+    self.by-version."aws-sdk"."2.1.13";
+  by-version."aws-sdk"."2.1.13" = self.buildNodePackage {
+    name = "aws-sdk-2.1.13";
+    version = "2.1.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.12.tgz";
-      name = "aws-sdk-2.1.12.tgz";
-      sha1 = "639419d26dc653020cc5ebd760ef09e193206843";
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.13.tgz";
+      name = "aws-sdk-2.1.13.tgz";
+      sha1 = "7ffbe7fa2a3fa97bd4a9924ca58e4220e92250f9";
     };
     deps = {
       "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.1.12";
+  "aws-sdk" = self.by-version."aws-sdk"."2.1.13";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
     name = "aws-sdk-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.5.tgz";
@@ -1313,12 +1754,17 @@
       "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
     name = "aws-sdk-1.18.0";
+    version = "1.18.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
@@ -1329,12 +1775,17 @@
       "xml2js-0.2.4" = self.by-version."xml2js"."0.2.4";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
     name = "aws-sdk-apis-3.1.10";
+    version = "3.1.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.10.tgz";
@@ -1343,12 +1794,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
   by-version."aws-sign"."0.2.0" = self.buildNodePackage {
     name = "aws-sign-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
@@ -1357,12 +1813,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sign"."~0.3.0" =
     self.by-version."aws-sign"."0.3.0";
   by-version."aws-sign"."0.3.0" = self.buildNodePackage {
     name = "aws-sign-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
@@ -1371,12 +1832,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sign2"."~0.5.0" =
     self.by-version."aws-sign2"."0.5.0";
   by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
     name = "aws-sign2-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
@@ -1385,12 +1851,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."backbone"."*" =
     self.by-version."backbone"."1.1.2";
   by-version."backbone"."1.1.2" = self.buildNodePackage {
     name = "backbone-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
@@ -1398,15 +1869,20 @@
       sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
     };
     deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "backbone" = self.by-version."backbone"."1.1.2";
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
   by-version."backoff"."2.1.0" = self.buildNodePackage {
     name = "backoff-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
@@ -1415,12 +1891,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."backoff"."~2.3.0" =
     self.by-version."backoff"."2.3.0";
   by-version."backoff"."2.3.0" = self.buildNodePackage {
     name = "backoff-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
@@ -1429,12 +1910,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."balanced-match"."^0.2.0" =
     self.by-version."balanced-match"."0.2.0";
   by-version."balanced-match"."0.2.0" = self.buildNodePackage {
     name = "balanced-match-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
@@ -1443,12 +1929,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base-converter"."1.1.2" =
     self.by-version."base-converter"."1.1.2";
   by-version."base-converter"."1.1.2" = self.buildNodePackage {
     name = "base-converter-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base-converter/-/base-converter-1.1.2.tgz";
@@ -1457,12 +1948,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base62"."0.1.1" =
     self.by-version."base62"."0.1.1";
   by-version."base62"."0.1.1" = self.buildNodePackage {
     name = "base62-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
@@ -1471,12 +1967,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64-arraybuffer"."0.1.2" =
     self.by-version."base64-arraybuffer"."0.1.2";
   by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
     name = "base64-arraybuffer-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
@@ -1485,12 +1986,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64-js"."0.0.6" =
     self.by-version."base64-js"."0.0.6";
   by-version."base64-js"."0.0.6" = self.buildNodePackage {
     name = "base64-js-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
@@ -1499,12 +2005,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64-js"."0.0.7" =
+    self.by-version."base64-js"."0.0.7";
+  by-version."base64-js"."0.0.7" = self.buildNodePackage {
+    name = "base64-js-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
+      name = "base64-js-0.0.7.tgz";
+      sha1 = "54400dc91d696cec32a8a47902f971522fee8f48";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64-js"."0.0.8" =
     self.by-version."base64-js"."0.0.8";
   by-version."base64-js"."0.0.8" = self.buildNodePackage {
     name = "base64-js-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
@@ -1513,7 +2043,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64-js"."~0.0.4" =
     self.by-version."base64-js"."0.0.8";
@@ -1521,6 +2055,7 @@
     self.by-version."base64-url"."1.2.1";
   by-version."base64-url"."1.2.1" = self.buildNodePackage {
     name = "base64-url-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
@@ -1529,7 +2064,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64-url"."1.2.1" =
     self.by-version."base64-url"."1.2.1";
@@ -1537,6 +2076,7 @@
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = self.buildNodePackage {
     name = "base64id-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
@@ -1545,12 +2085,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64url"."0.0.3" =
     self.by-version."base64url"."0.0.3";
   by-version."base64url"."0.0.3" = self.buildNodePackage {
     name = "base64url-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
@@ -1560,12 +2105,17 @@
     deps = {
       "tap-0.3.3" = self.by-version."tap"."0.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64url"."0.0.6" =
     self.by-version."base64url"."0.0.6";
   by-version."base64url"."0.0.6" = self.buildNodePackage {
     name = "base64url-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
@@ -1574,7 +2124,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."base64url"."~0.0.3" =
     self.by-version."base64url"."0.0.6";
@@ -1582,6 +2136,7 @@
     self.by-version."basic-auth"."1.0.0";
   by-version."basic-auth"."1.0.0" = self.buildNodePackage {
     name = "basic-auth-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
@@ -1590,12 +2145,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
   by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
     name = "basic-auth-connect-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
@@ -1604,12 +2164,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."batbelt"."0.0.2" =
     self.by-version."batbelt"."0.0.2";
   by-version."batbelt"."0.0.2" = self.buildNodePackage {
     name = "batbelt-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/batbelt/-/batbelt-0.0.2.tgz";
@@ -1619,12 +2184,17 @@
     deps = {
       "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."batch"."0.5.0" =
     self.by-version."batch"."0.5.0";
   by-version."batch"."0.5.0" = self.buildNodePackage {
     name = "batch-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
@@ -1633,12 +2203,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."batch"."0.5.1" =
     self.by-version."batch"."0.5.1";
   by-version."batch"."0.5.1" = self.buildNodePackage {
     name = "batch-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
@@ -1647,12 +2222,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."batch"."0.5.2" =
     self.by-version."batch"."0.5.2";
   by-version."batch"."0.5.2" = self.buildNodePackage {
     name = "batch-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz";
@@ -1661,12 +2241,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bcrypt"."*" =
     self.by-version."bcrypt"."0.8.1";
   by-version."bcrypt"."0.8.1" = self.buildNodePackage {
     name = "bcrypt-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.1.tgz";
@@ -1677,15 +2262,39 @@
       "bindings-1.0.0" = self.by-version."bindings"."1.0.0";
       "nan-1.5.0" = self.by-version."nan"."1.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bcrypt" = self.by-version."bcrypt"."0.8.1";
   by-spec."bcrypt".">=0.5.0" =
     self.by-version."bcrypt"."0.8.1";
+  by-spec."bcryptjs"."2.1.0" =
+    self.by-version."bcryptjs"."2.1.0";
+  by-version."bcryptjs"."2.1.0" = self.buildNodePackage {
+    name = "bcryptjs-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bcryptjs/-/bcryptjs-2.1.0.tgz";
+      name = "bcryptjs-2.1.0.tgz";
+      sha1 = "5e6076196f6e3e957820aceb004410a7cf367042";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."beeper"."^1.0.0" =
     self.by-version."beeper"."1.0.0";
   by-version."beeper"."1.0.0" = self.buildNodePackage {
     name = "beeper-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz";
@@ -1694,12 +2303,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bencode"."^0.6.0" =
     self.by-version."bencode"."0.6.0";
   by-version."bencode"."0.6.0" = self.buildNodePackage {
     name = "bencode-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
@@ -1708,12 +2322,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."better-assert"."~1.0.0" =
     self.by-version."better-assert"."1.0.2";
   by-version."better-assert"."1.0.2" = self.buildNodePackage {
     name = "better-assert-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
@@ -1723,12 +2342,40 @@
     deps = {
       "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."biased-opener"."~0.2.2" =
+    self.by-version."biased-opener"."0.2.2";
+  by-version."biased-opener"."0.2.2" = self.buildNodePackage {
+    name = "biased-opener-0.2.2";
+    version = "0.2.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/biased-opener/-/biased-opener-0.2.2.tgz";
+      name = "biased-opener-0.2.2.tgz";
+      sha1 = "e02a8eb20a07b1e1b555a3bf1e56f51b43465d98";
+    };
+    deps = {
+      "browser-launcher2-0.4.4" = self.by-version."browser-launcher2"."0.4.4";
+      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "opener-1.4.0" = self.by-version."opener"."1.4.0";
+      "x-default-browser-0.3.0" = self.by-version."x-default-browser"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bigi"."^1.1.0" =
     self.by-version."bigi"."1.4.0";
   by-version."bigi"."1.4.0" = self.buildNodePackage {
     name = "bigi-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bigi/-/bigi-1.4.0.tgz";
@@ -1737,12 +2384,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bignumber.js"."^1.3.0" =
     self.by-version."bignumber.js"."1.5.0";
   by-version."bignumber.js"."1.5.0" = self.buildNodePackage {
     name = "bignumber.js-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz";
@@ -1751,12 +2403,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."binary"."~0.3.0" =
     self.by-version."binary"."0.3.0";
   by-version."binary"."0.3.0" = self.buildNodePackage {
     name = "binary-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
@@ -1767,12 +2424,17 @@
       "chainsaw-0.1.0" = self.by-version."chainsaw"."0.1.0";
       "buffers-0.1.1" = self.by-version."buffers"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."binary-extensions"."^1.0.0" =
     self.by-version."binary-extensions"."1.3.0";
   by-version."binary-extensions"."1.3.0" = self.buildNodePackage {
     name = "binary-extensions-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/binary-extensions/-/binary-extensions-1.3.0.tgz";
@@ -1781,12 +2443,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."binaryheap".">= 0.0.3" =
     self.by-version."binaryheap"."0.0.3";
   by-version."binaryheap"."0.0.3" = self.buildNodePackage {
     name = "binaryheap-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
@@ -1795,12 +2462,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bindings"."*" =
     self.by-version."bindings"."1.2.1";
   by-version."bindings"."1.2.1" = self.buildNodePackage {
     name = "bindings-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
@@ -1809,12 +2481,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bindings"."1.0.0" =
     self.by-version."bindings"."1.0.0";
   by-version."bindings"."1.0.0" = self.buildNodePackage {
     name = "bindings-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
@@ -1823,12 +2500,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bindings"."1.1.0" =
     self.by-version."bindings"."1.1.0";
   by-version."bindings"."1.1.0" = self.buildNodePackage {
     name = "bindings-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz";
@@ -1837,12 +2519,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bindings"."1.1.1" =
     self.by-version."bindings"."1.1.1";
   by-version."bindings"."1.1.1" = self.buildNodePackage {
     name = "bindings-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
@@ -1851,12 +2538,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bindings"."1.2.0" =
     self.by-version."bindings"."1.2.0";
   by-version."bindings"."1.2.0" = self.buildNodePackage {
     name = "bindings-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
@@ -1865,8 +2557,14 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."bindings"."1.2.1" =
+    self.by-version."bindings"."1.2.1";
   by-spec."bindings"."1.2.x" =
     self.by-version."bindings"."1.2.1";
   by-spec."bindings".">=1.2.1" =
@@ -1881,6 +2579,7 @@
     self.by-version."bip-pod"."0.3.8";
   by-version."bip-pod"."0.3.8" = self.buildNodePackage {
     name = "bip-pod-0.3.8";
+    version = "0.3.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.8.tgz";
@@ -1900,15 +2599,20 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23";
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-alchemy"."*" =
     self.by-version."bip-pod-alchemy"."0.3.0";
   by-version."bip-pod-alchemy"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-alchemy-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.0.tgz";
@@ -1918,13 +2622,18 @@
     deps = {
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.0";
   by-spec."bip-pod-bitly"."*" =
     self.by-version."bip-pod-bitly"."0.3.0";
   by-version."bip-pod-bitly"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-bitly-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.0.tgz";
@@ -1936,13 +2645,18 @@
       "passport-bitly-0.1.0" = self.by-version."passport-bitly"."0.1.0";
       "request-2.29.0" = self.by-version."request"."2.29.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.0";
   by-spec."bip-pod-chain"."*" =
     self.by-version."bip-pod-chain"."0.3.0";
   by-version."bip-pod-chain"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-chain-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.0.tgz";
@@ -1952,13 +2666,18 @@
     deps = {
       "chain-node-3.1.0" = self.by-version."chain-node"."3.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-chain" = self.by-version."bip-pod-chain"."0.3.0";
   by-spec."bip-pod-circonus"."*" =
     self.by-version."bip-pod-circonus"."0.3.0";
   by-version."bip-pod-circonus"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-circonus-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.0.tgz";
@@ -1967,13 +2686,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.0";
   by-spec."bip-pod-coindesk"."*" =
     self.by-version."bip-pod-coindesk"."0.3.0";
   by-version."bip-pod-coindesk"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-coindesk-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.0.tgz";
@@ -1982,13 +2706,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.0";
   by-spec."bip-pod-craigslist"."*" =
     self.by-version."bip-pod-craigslist"."0.3.0";
   by-version."bip-pod-craigslist"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-craigslist-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.0.tgz";
@@ -1998,13 +2727,18 @@
     deps = {
       "node-craigslist-0.1.7" = self.by-version."node-craigslist"."0.1.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-craigslist" = self.by-version."bip-pod-craigslist"."0.3.0";
   by-spec."bip-pod-crypto"."*" =
     self.by-version."bip-pod-crypto"."0.3.0";
   by-version."bip-pod-crypto"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-crypto-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.0.tgz";
@@ -2013,7 +2747,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-crypto" = self.by-version."bip-pod-crypto"."0.3.0";
   by-spec."bip-pod-crypto".">=0.0.1" =
@@ -2022,6 +2760,7 @@
     self.by-version."bip-pod-dropbox"."0.3.0";
   by-version."bip-pod-dropbox"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-dropbox-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.0.tgz";
@@ -2034,13 +2773,18 @@
       "passport-dropbox-0.1.2" = self.by-version."passport-dropbox"."0.1.2";
       "dropbox-0.9.2" = self.by-version."dropbox"."0.9.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.0";
   by-spec."bip-pod-email".">=0.0.1" =
     self.by-version."bip-pod-email"."0.3.3";
   by-version."bip-pod-email"."0.3.3" = self.buildNodePackage {
     name = "bip-pod-email-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.3.tgz";
@@ -2053,12 +2797,17 @@
       "nodemailer-0.7.1" = self.by-version."nodemailer"."0.7.1";
       "ejs-0.7.1" = self.by-version."ejs"."0.7.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-embedly"."*" =
     self.by-version."bip-pod-embedly"."0.3.0";
   by-version."bip-pod-embedly"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-embedly-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.0.tgz";
@@ -2069,13 +2818,18 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "embedly-1.0.4" = self.by-version."embedly"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-embedly" = self.by-version."bip-pod-embedly"."0.3.0";
   by-spec."bip-pod-evernote"."*" =
     self.by-version."bip-pod-evernote"."0.3.1";
   by-version."bip-pod-evernote"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-evernote-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.1.tgz";
@@ -2085,16 +2839,21 @@
     deps = {
       "evernote-1.25.4" = self.by-version."evernote"."1.25.4";
       "passport-evernote-0.1.1" = self.by-version."passport-evernote"."0.1.1";
-      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
       "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.1";
   by-spec."bip-pod-facebook"."*" =
     self.by-version."bip-pod-facebook"."0.3.0";
   by-version."bip-pod-facebook"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-facebook-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.0.tgz";
@@ -2109,13 +2868,18 @@
       "passport-facebook-1.0.3" = self.by-version."passport-facebook"."1.0.3";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.0";
   by-spec."bip-pod-flickr"."*" =
     self.by-version."bip-pod-flickr"."0.3.1";
   by-version."bip-pod-flickr"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-flickr-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.1.tgz";
@@ -2126,13 +2890,18 @@
       "passport-flickr-0.2.0" = self.by-version."passport-flickr"."0.2.0";
       "flickrapi-0.3.28" = self.by-version."flickrapi"."0.3.28";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.1";
   by-spec."bip-pod-flow".">=0.0.1" =
     self.by-version."bip-pod-flow"."0.3.1";
   by-version."bip-pod-flow"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-flow-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.1.tgz";
@@ -2142,16 +2911,21 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
+      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-github"."*" =
     self.by-version."bip-pod-github"."0.3.1";
   by-version."bip-pod-github"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-github-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.1.tgz";
@@ -2161,13 +2935,18 @@
     deps = {
       "passport-github-0.1.5" = self.by-version."passport-github"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-github" = self.by-version."bip-pod-github"."0.3.1";
   by-spec."bip-pod-gmail"."*" =
     self.by-version."bip-pod-gmail"."0.3.1";
   by-version."bip-pod-gmail"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-gmail-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.1.tgz";
@@ -2179,13 +2958,18 @@
       "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.1";
   by-spec."bip-pod-google"."*" =
     self.by-version."bip-pod-google"."0.3.0";
   by-version."bip-pod-google"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-google-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.0.tgz";
@@ -2197,13 +2981,18 @@
       "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
       "googleapis-0.8.0" = self.by-version."googleapis"."0.8.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-google" = self.by-version."bip-pod-google"."0.3.0";
   by-spec."bip-pod-google-drive"."*" =
     self.by-version."bip-pod-google-drive"."0.3.0";
   by-version."bip-pod-google-drive"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-google-drive-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.0.tgz";
@@ -2215,13 +3004,18 @@
       "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.0";
   by-spec."bip-pod-html".">=0.0.1" =
     self.by-version."bip-pod-html"."0.3.1";
   by-version."bip-pod-html"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-html-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.1.tgz";
@@ -2232,12 +3026,17 @@
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
       "jsdom-0.10.6" = self.by-version."jsdom"."0.10.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-http".">=0.0.1" =
     self.by-version."bip-pod-http"."0.3.0";
   by-version."bip-pod-http"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-http-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.0.tgz";
@@ -2247,12 +3046,17 @@
     deps = {
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-imgur"."*" =
     self.by-version."bip-pod-imgur"."0.3.0";
   by-version."bip-pod-imgur"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-imgur-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.0.tgz";
@@ -2265,13 +3069,18 @@
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.0";
   by-spec."bip-pod-instagram"."*" =
     self.by-version."bip-pod-instagram"."0.3.0";
   by-version."bip-pod-instagram"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-instagram-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.0.tgz";
@@ -2283,13 +3092,18 @@
       "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2";
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.0";
   by-spec."bip-pod-kato"."*" =
     self.by-version."bip-pod-kato"."0.3.0";
   by-version."bip-pod-kato"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-kato-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.0.tgz";
@@ -2298,13 +3112,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.0";
   by-spec."bip-pod-keenio"."*" =
     self.by-version."bip-pod-keenio"."0.3.0";
   by-version."bip-pod-keenio"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-keenio-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.0.tgz";
@@ -2314,13 +3133,18 @@
     deps = {
       "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.0";
   by-spec."bip-pod-mailchimp"."*" =
     self.by-version."bip-pod-mailchimp"."0.3.1";
   by-version."bip-pod-mailchimp"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-mailchimp-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.1.tgz";
@@ -2331,13 +3155,18 @@
       "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1";
       "mailchimp-1.1.0" = self.by-version."mailchimp"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.1";
   by-spec."bip-pod-mailgun"."*" =
     self.by-version."bip-pod-mailgun"."0.3.0";
   by-version."bip-pod-mailgun"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-mailgun-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.0.tgz";
@@ -2347,13 +3176,18 @@
     deps = {
       "mailgun-js-0.6.8" = self.by-version."mailgun-js"."0.6.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.0";
   by-spec."bip-pod-math".">=0.0.1" =
     self.by-version."bip-pod-math"."0.3.2";
   by-version."bip-pod-math"."0.3.2" = self.buildNodePackage {
     name = "bip-pod-math-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.2.tgz";
@@ -2363,12 +3197,17 @@
     deps = {
       "mathjs-0.19.0" = self.by-version."mathjs"."0.19.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-mixcloud"."*" =
     self.by-version."bip-pod-mixcloud"."0.3.0";
   by-version."bip-pod-mixcloud"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-mixcloud-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.0.tgz";
@@ -2380,13 +3219,18 @@
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.0";
   by-spec."bip-pod-mongodb"."*" =
     self.by-version."bip-pod-mongodb"."0.3.1";
   by-version."bip-pod-mongodb"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-mongodb-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.1.tgz";
@@ -2397,13 +3241,18 @@
       "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.1";
   by-spec."bip-pod-numerous"."*" =
     self.by-version."bip-pod-numerous"."0.3.0";
   by-version."bip-pod-numerous"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-numerous-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.0.tgz";
@@ -2413,13 +3262,18 @@
     deps = {
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.0";
   by-spec."bip-pod-pushbullet"."*" =
     self.by-version."bip-pod-pushbullet"."0.3.0";
   by-version."bip-pod-pushbullet"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-pushbullet-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.0.tgz";
@@ -2428,13 +3282,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.0";
   by-spec."bip-pod-pusher"."*" =
     self.by-version."bip-pod-pusher"."0.3.0";
   by-version."bip-pod-pusher"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-pusher-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.0.tgz";
@@ -2444,13 +3303,18 @@
     deps = {
       "pusher-1.0.4" = self.by-version."pusher"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.0";
   by-spec."bip-pod-soundcloud"."*" =
     self.by-version."bip-pod-soundcloud"."0.3.0";
   by-version."bip-pod-soundcloud"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-soundcloud-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.0.tgz";
@@ -2462,13 +3326,18 @@
       "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2";
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.0";
   by-spec."bip-pod-statuscake"."*" =
     self.by-version."bip-pod-statuscake"."0.3.0";
   by-version."bip-pod-statuscake"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-statuscake-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.0.tgz";
@@ -2477,13 +3346,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.0";
   by-spec."bip-pod-syndication".">=0.0.1" =
     self.by-version."bip-pod-syndication"."0.3.5";
   by-version."bip-pod-syndication"."0.3.5" = self.buildNodePackage {
     name = "bip-pod-syndication-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.5.tgz";
@@ -2491,7 +3365,7 @@
       sha1 = "21874326672a82a56bc40702efabfb3cbfa66d49";
     };
     deps = {
-      "ejs-2.2.4" = self.by-version."ejs"."2.2.4";
+      "ejs-2.3.1" = self.by-version."ejs"."2.3.1";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
       "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2";
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
@@ -2504,12 +3378,17 @@
       "send-0.9.3" = self.by-version."send"."0.9.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-templater".">=0.0.1" =
     self.by-version."bip-pod-templater"."0.3.0";
   by-version."bip-pod-templater"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-templater-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.0.tgz";
@@ -2522,12 +3401,17 @@
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-time".">=0.0.1" =
     self.by-version."bip-pod-time"."0.3.1";
   by-version."bip-pod-time"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-time-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.1.tgz";
@@ -2539,12 +3423,17 @@
       "moment-timezone-0.0.3" = self.by-version."moment-timezone"."0.0.3";
       "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bip-pod-todoist"."*" =
     self.by-version."bip-pod-todoist"."0.3.0";
   by-version."bip-pod-todoist"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-todoist-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.0.tgz";
@@ -2553,13 +3442,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.0";
   by-spec."bip-pod-trello"."*" =
     self.by-version."bip-pod-trello"."0.3.0";
   by-version."bip-pod-trello"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-trello-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.0.tgz";
@@ -2568,15 +3462,20 @@
     };
     deps = {
       "passport-trello-0.1.4" = self.by-version."passport-trello"."0.1.4";
-      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.0";
   by-spec."bip-pod-twilio"."*" =
     self.by-version."bip-pod-twilio"."0.3.1";
   by-version."bip-pod-twilio"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-twilio-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.1.tgz";
@@ -2586,20 +3485,25 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "twilio-1.10.0" = self.by-version."twilio"."1.10.0";
+      "twilio-1.11.0" = self.by-version."twilio"."1.11.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.1";
   by-spec."bip-pod-twitter"."*" =
-    self.by-version."bip-pod-twitter"."0.3.3";
-  by-version."bip-pod-twitter"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-twitter-0.3.3";
+    self.by-version."bip-pod-twitter"."0.3.4";
+  by-version."bip-pod-twitter"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-twitter-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.3.tgz";
-      name = "bip-pod-twitter-0.3.3.tgz";
-      sha1 = "3ecdaf0e54d1ec23fd0d9b478db5a215997b330b";
+      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.4.tgz";
+      name = "bip-pod-twitter-0.3.4.tgz";
+      sha1 = "77ce4dbf50a787c22bd2dfe73028d967c0948973";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -2607,13 +3511,18 @@
       "ntwitter-0.5.0" = self.by-version."ntwitter"."0.5.0";
       "passport-twitter-1.0.2" = self.by-version."passport-twitter"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.3";
+  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.4";
   by-spec."bip-pod-witai"."*" =
     self.by-version."bip-pod-witai"."0.3.0";
   by-version."bip-pod-witai"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-witai-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.0.tgz";
@@ -2622,13 +3531,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-witai" = self.by-version."bip-pod-witai"."0.3.0";
   by-spec."bip-pod-wordpress"."*" =
     self.by-version."bip-pod-wordpress"."0.3.0";
   by-version."bip-pod-wordpress"."0.3.0" = self.buildNodePackage {
     name = "bip-pod-wordpress-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.0.tgz";
@@ -2640,13 +3554,18 @@
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "passport-wordpress-0.0.3" = self.by-version."passport-wordpress"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.0";
   by-spec."bip-pod-zoho"."*" =
     self.by-version."bip-pod-zoho"."0.3.1";
   by-version."bip-pod-zoho"."0.3.1" = self.buildNodePackage {
     name = "bip-pod-zoho-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bip-pod-zoho/-/bip-pod-zoho-0.3.1.tgz";
@@ -2656,20 +3575,25 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
+      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1";
   by-spec."bipio"."*" =
-    self.by-version."bipio"."0.3.18";
-  by-version."bipio"."0.3.18" = self.buildNodePackage {
-    name = "bipio-0.3.18";
+    self.by-version."bipio"."0.3.24";
+  by-version."bipio"."0.3.24" = self.buildNodePackage {
+    name = "bipio-0.3.24";
+    version = "0.3.24";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.18.tgz";
-      name = "bipio-0.3.18.tgz";
-      sha1 = "6d695785dac53ceb138f4e4a99499c0d846cd77d";
+      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.24.tgz";
+      name = "bipio-0.3.24.tgz";
+      sha1 = "cd828183d7e54ba488a9ffdf164ddc1327e21c3d";
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
@@ -2696,10 +3620,10 @@
       "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
       "cron-1.0.6" = self.by-version."cron"."1.0.6";
       "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3";
-      "datejs-1.0.0-rc3" = self.by-version."datejs"."1.0.0-rc3";
+      "datejs-0.0.2" = self.by-version."datejs"."0.0.2";
       "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4";
       "execSync-1.0.2" = self.by-version."execSync"."1.0.2";
-      "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
+      "express-4.12.0" = self.by-version."express"."4.12.0";
       "express-session-1.10.3" = self.by-version."express-session"."1.10.3";
       "extend-2.0.0" = self.by-version."extend"."2.0.0";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
@@ -2712,6 +3636,7 @@
       "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2";
       "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0";
       "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
       "marked-0.3.3" = self.by-version."marked"."0.3.3";
       "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2";
       "method-override-1.0.2" = self.by-version."method-override"."1.0.2";
@@ -2719,33 +3644,38 @@
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "moment-2.9.0" = self.by-version."moment"."2.9.0";
       "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7";
-      "multer-0.1.7" = self.by-version."multer"."0.1.7";
+      "multer-0.1.8" = self.by-version."multer"."0.1.8";
       "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
-      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "sleep-1.2.0" = self.by-version."sleep"."1.2.0";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
-      "ssl-root-cas-1.1.9-beta" = self.by-version."ssl-root-cas"."1.1.9-beta";
+      "ssl-root-cas-1.1.7" = self.by-version."ssl-root-cas"."1.1.7";
       "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
       "time-0.11.1" = self.by-version."time"."0.11.1";
       "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23";
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
       "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5";
       "winston-0.5.1" = self.by-version."winston"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "bipio" = self.by-version."bipio"."0.3.18";
+  "bipio" = self.by-version."bipio"."0.3.24";
   by-spec."bitcoinjs-lib"."1.2.0" =
     self.by-version."bitcoinjs-lib"."1.2.0";
   by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage {
     name = "bitcoinjs-lib-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-1.2.0.tgz";
@@ -2758,12 +3688,17 @@
       "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12";
       "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bitfield"."^0.1.0" =
     self.by-version."bitfield"."0.1.0";
   by-version."bitfield"."0.1.0" = self.buildNodePackage {
     name = "bitfield-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz";
@@ -2772,12 +3707,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bits"."~0.1.1" =
     self.by-version."bits"."0.1.1";
   by-version."bits"."0.1.1" = self.buildNodePackage {
     name = "bits-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz";
@@ -2786,12 +3726,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bittorrent-dht"."^1.0.0" =
     self.by-version."bittorrent-dht"."1.5.0";
   by-version."bittorrent-dht"."1.5.0" = self.buildNodePackage {
     name = "bittorrent-dht-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz";
@@ -2811,12 +3756,17 @@
       "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."bittorrent-dht"."^2.1.1" =
+  by-spec."bittorrent-dht"."^2.6.4" =
     self.by-version."bittorrent-dht"."2.6.4";
   by-version."bittorrent-dht"."2.6.4" = self.buildNodePackage {
     name = "bittorrent-dht-2.6.4";
+    version = "2.6.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz";
@@ -2837,14 +3787,17 @@
       "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."bittorrent-dht"."^2.6.4" =
-    self.by-version."bittorrent-dht"."2.6.4";
   by-spec."bittorrent-tracker"."^2.0.0" =
     self.by-version."bittorrent-tracker"."2.12.1";
   by-version."bittorrent-tracker"."2.12.1" = self.buildNodePackage {
     name = "bittorrent-tracker-2.12.1";
+    version = "2.12.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz";
@@ -2867,7 +3820,11 @@
       "simple-get-1.3.0" = self.by-version."simple-get"."1.3.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bittorrent-tracker"."^2.6.0" =
     self.by-version."bittorrent-tracker"."2.12.1";
@@ -2875,6 +3832,7 @@
     self.by-version."bl"."0.9.4";
   by-version."bl"."0.9.4" = self.buildNodePackage {
     name = "bl-0.9.4";
+    version = "0.9.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
@@ -2884,7 +3842,11 @@
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bl"."~0.9.0" =
     self.by-version."bl"."0.9.4";
@@ -2892,6 +3854,7 @@
     self.by-version."blob"."0.0.2";
   by-version."blob"."0.0.2" = self.buildNodePackage {
     name = "blob-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz";
@@ -2900,12 +3863,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = self.buildNodePackage {
     name = "block-stream-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
@@ -2915,28 +3883,38 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
   by-spec."bluebird".">= 2.3.2" =
-    self.by-version."bluebird"."2.9.9";
-  by-version."bluebird"."2.9.9" = self.buildNodePackage {
-    name = "bluebird-2.9.9";
+    self.by-version."bluebird"."2.9.12";
+  by-version."bluebird"."2.9.12" = self.buildNodePackage {
+    name = "bluebird-2.9.12";
+    version = "2.9.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
-      name = "bluebird-2.9.9.tgz";
-      sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.12.tgz";
+      name = "bluebird-2.9.12.tgz";
+      sha1 = "b108b6d659a7bb0b88d08a8079c91bcfc43e15a6";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = self.buildNodePackage {
     name = "blueimp-md5-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
@@ -2945,12 +3923,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bn.js"."^1.0.0" =
     self.by-version."bn.js"."1.3.0";
   by-version."bn.js"."1.3.0" = self.buildNodePackage {
     name = "bn.js-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz";
@@ -2959,12 +3942,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bncode"."^0.2.3" =
     self.by-version."bncode"."0.2.3";
   by-version."bncode"."0.2.3" = self.buildNodePackage {
     name = "bncode-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz";
@@ -2973,12 +3961,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bncode"."^0.5.2" =
     self.by-version."bncode"."0.5.3";
   by-version."bncode"."0.5.3" = self.buildNodePackage {
     name = "bncode-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz";
@@ -2987,12 +3980,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."body-parser"."1.5.0" =
     self.by-version."body-parser"."1.5.0";
   by-version."body-parser"."1.5.0" = self.buildNodePackage {
     name = "body-parser-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/body-parser/-/body-parser-1.5.0.tgz";
@@ -3008,12 +4006,17 @@
       "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
       "type-is-1.3.2" = self.by-version."type-is"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."body-parser"."^1.0.2" =
     self.by-version."body-parser"."1.12.0";
   by-version."body-parser"."1.12.0" = self.buildNodePackage {
     name = "body-parser-1.12.0";
+    version = "1.12.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.0.tgz";
@@ -3031,36 +4034,19 @@
       "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3";
       "type-is-1.6.0" = self.by-version."type-is"."1.6.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."body-parser"."~1.10.2" =
-    self.by-version."body-parser"."1.10.2";
-  by-version."body-parser"."1.10.2" = self.buildNodePackage {
-    name = "body-parser-1.10.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.10.2.tgz";
-      name = "body-parser-1.10.2.tgz";
-      sha1 = "405d465fcd3ccf0ea8a35adbf1055f6e98316bd1";
-    };
-    deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."body-parser"."~1.12.0" =
     self.by-version."body-parser"."1.12.0";
-  by-spec."body-parser"."~1.8.4" =
+  by-spec."body-parser"."~1.8.2" =
     self.by-version."body-parser"."1.8.4";
   by-version."body-parser"."1.8.4" = self.buildNodePackage {
     name = "body-parser-1.8.4";
+    version = "1.8.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz";
@@ -3077,12 +4063,19 @@
       "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."body-parser"."~1.8.4" =
+    self.by-version."body-parser"."1.8.4";
   by-spec."body-parser"."~1.9.3" =
     self.by-version."body-parser"."1.9.3";
   by-version."body-parser"."1.9.3" = self.buildNodePackage {
     name = "body-parser-1.9.3";
+    version = "1.9.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz";
@@ -3099,12 +4092,17 @@
       "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = self.buildNodePackage {
     name = "boom-0.3.8";
+    version = "0.3.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
@@ -3114,12 +4112,17 @@
     deps = {
       "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
   by-version."boom"."0.4.2" = self.buildNodePackage {
     name = "boom-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
@@ -3129,12 +4132,17 @@
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."boom"."2.x.x" =
     self.by-version."boom"."2.6.1";
   by-version."boom"."2.6.1" = self.buildNodePackage {
     name = "boom-2.6.1";
+    version = "2.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz";
@@ -3144,12 +4152,17 @@
     deps = {
       "hoek-2.11.0" = self.by-version."hoek"."2.11.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower"."*" =
     self.by-version."bower"."1.3.12";
   by-version."bower"."1.3.12" = self.buildNodePackage {
     name = "bower-1.3.12";
+    version = "1.3.12";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz";
@@ -3176,7 +4189,7 @@
       "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1";
       "insight-0.4.3" = self.by-version."insight"."0.4.3";
       "is-root-1.0.0" = self.by-version."is-root"."1.0.0";
-      "junk-1.0.0" = self.by-version."junk"."1.0.0";
+      "junk-1.0.1" = self.by-version."junk"."1.0.1";
       "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -3199,7 +4212,11 @@
       "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bower" = self.by-version."bower"."1.3.12";
   by-spec."bower".">=1.2.8 <2" =
@@ -3208,6 +4225,7 @@
     self.by-version."bower-config"."0.5.2";
   by-version."bower-config"."0.5.2" = self.buildNodePackage {
     name = "bower-config-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
@@ -3220,7 +4238,11 @@
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-config"."~0.5.2" =
     self.by-version."bower-config"."0.5.2";
@@ -3228,6 +4250,7 @@
     self.by-version."bower-endpoint-parser"."0.2.1";
   by-version."bower-endpoint-parser"."0.2.1" = self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
@@ -3236,12 +4259,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-endpoint-parser"."~0.2.2" =
     self.by-version."bower-endpoint-parser"."0.2.2";
   by-version."bower-endpoint-parser"."0.2.2" = self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
@@ -3250,12 +4278,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-json"."0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-version."bower-json"."0.4.0" = self.buildNodePackage {
     name = "bower-json-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
@@ -3267,7 +4300,11 @@
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "intersect-0.0.3" = self.by-version."intersect"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-json"."~0.4.0" =
     self.by-version."bower-json"."0.4.0";
@@ -3275,6 +4312,7 @@
     self.by-version."bower-logger"."0.2.1";
   by-version."bower-logger"."0.2.1" = self.buildNodePackage {
     name = "bower-logger-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
@@ -3283,12 +4321,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-logger"."~0.2.2" =
     self.by-version."bower-logger"."0.2.2";
   by-version."bower-logger"."0.2.2" = self.buildNodePackage {
     name = "bower-logger-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
@@ -3297,12 +4340,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower-registry-client"."~0.2.0" =
     self.by-version."bower-registry-client"."0.2.3";
   by-version."bower-registry-client"."0.2.3" = self.buildNodePackage {
     name = "bower-registry-client-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.3.tgz";
@@ -3319,12 +4367,17 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bower2nix"."*" =
     self.by-version."bower2nix"."2.1.0";
   by-version."bower2nix"."2.1.0" = self.buildNodePackage {
     name = "bower2nix-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz";
@@ -3343,13 +4396,18 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "fetch-bower-2.0.0" = self.by-version."fetch-bower"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bower2nix" = self.by-version."bower2nix"."2.1.0";
   by-spec."bplist-parser"."0.0.6" =
     self.by-version."bplist-parser"."0.0.6";
   by-version."bplist-parser"."0.0.6" = self.buildNodePackage {
     name = "bplist-parser-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
@@ -3358,12 +4416,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."brace-expansion"."^1.0.0" =
     self.by-version."brace-expansion"."1.1.0";
   by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
     name = "brace-expansion-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
@@ -3374,26 +4437,36 @@
       "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."breakable"."~0.1.0" =
-    self.by-version."breakable"."0.1.0";
-  by-version."breakable"."0.1.0" = self.buildNodePackage {
-    name = "breakable-0.1.0";
+  by-spec."breakable"."~1.0.0" =
+    self.by-version."breakable"."1.0.0";
+  by-version."breakable"."1.0.0" = self.buildNodePackage {
+    name = "breakable-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/breakable/-/breakable-0.1.0.tgz";
-      name = "breakable-0.1.0.tgz";
-      sha1 = "fe6325427b2662bd6e024009bf232f3e35fab7f5";
+      url = "http://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz";
+      name = "breakable-1.0.0.tgz";
+      sha1 = "784a797915a38ead27bad456b5572cb4bbaa78c1";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."brfs"."0.0.8" =
     self.by-version."brfs"."0.0.8";
   by-version."brfs"."0.0.8" = self.buildNodePackage {
     name = "brfs-0.0.8";
+    version = "0.0.8";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz";
@@ -3405,12 +4478,17 @@
       "falafel-0.1.6" = self.by-version."falafel"."0.1.6";
       "escodegen-0.0.17" = self.by-version."escodegen"."0.0.17";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."broadway"."0.2.x" =
     self.by-version."broadway"."0.2.10";
   by-version."broadway"."0.2.10" = self.buildNodePackage {
     name = "broadway-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
@@ -3424,12 +4502,17 @@
       "winston-0.7.2" = self.by-version."winston"."0.7.2";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."broadway"."~0.3.2" =
     self.by-version."broadway"."0.3.6";
   by-version."broadway"."0.3.6" = self.buildNodePackage {
     name = "broadway-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
@@ -3443,7 +4526,11 @@
       "winston-0.8.0" = self.by-version."winston"."0.8.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."broadway"."~0.3.6" =
     self.by-version."broadway"."0.3.6";
@@ -3451,6 +4538,7 @@
     self.by-version."brorand"."1.0.5";
   by-version."brorand"."1.0.5" = self.buildNodePackage {
     name = "brorand-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
@@ -3459,12 +4547,44 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browser-launcher2"."0.4.4" =
+    self.by-version."browser-launcher2"."0.4.4";
+  by-version."browser-launcher2"."0.4.4" = self.buildNodePackage {
+    name = "browser-launcher2-0.4.4";
+    version = "0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.4.tgz";
+      name = "browser-launcher2-0.4.4.tgz";
+      sha1 = "1e2b98ec9bc1c711084174d5b2c82598b5c0d1e4";
+    };
+    deps = {
+      "headless-0.1.7" = self.by-version."headless"."0.1.7";
+      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+      "plist-1.1.0" = self.by-version."plist"."1.1.0";
+      "win-detect-browsers-0.0.2" = self.by-version."win-detect-browsers"."0.0.2";
+      "uid-0.0.2" = self.by-version."uid"."0.0.2";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-pack"."^3.2.0" =
     self.by-version."browser-pack"."3.2.0";
   by-version."browser-pack"."3.2.0" = self.buildNodePackage {
     name = "browser-pack-3.2.0";
+    version = "3.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz";
@@ -3479,12 +4599,42 @@
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
       "umd-2.1.0" = self.by-version."umd"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browser-pack"."^4.0.0" =
+    self.by-version."browser-pack"."4.0.0";
+  by-version."browser-pack"."4.0.0" = self.buildNodePackage {
+    name = "browser-pack-4.0.0";
+    version = "4.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-4.0.0.tgz";
+      name = "browser-pack-4.0.0.tgz";
+      sha1 = "172a63e45a7f5a1df83386cd861ca2d96ace2e77";
+    };
+    deps = {
+      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+      "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
+      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "defined-0.0.0" = self.by-version."defined"."0.0.0";
+      "through2-0.5.1" = self.by-version."through2"."0.5.1";
+      "umd-3.0.0" = self.by-version."umd"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-pack"."~2.0.0" =
     self.by-version."browser-pack"."2.0.1";
   by-version."browser-pack"."2.0.1" = self.buildNodePackage {
     name = "browser-pack-2.0.1";
+    version = "2.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
@@ -3496,12 +4646,17 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-request".">= 0.2.0" =
     self.by-version."browser-request"."0.3.3";
   by-version."browser-request"."0.3.3" = self.buildNodePackage {
     name = "browser-request-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
@@ -3510,31 +4665,43 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-request"."~0.3.1" =
     self.by-version."browser-request"."0.3.3";
   by-spec."browser-resolve"."^1.3.0" =
-    self.by-version."browser-resolve"."1.7.0";
-  by-version."browser-resolve"."1.7.0" = self.buildNodePackage {
-    name = "browser-resolve-1.7.0";
+    self.by-version."browser-resolve"."1.7.2";
+  by-version."browser-resolve"."1.7.2" = self.buildNodePackage {
+    name = "browser-resolve-1.7.2";
+    version = "1.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.0.tgz";
-      name = "browser-resolve-1.7.0.tgz";
-      sha1 = "b0efbb9b7da0b325328d3db9ceb7ee346939913e";
+      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.2.tgz";
+      name = "browser-resolve-1.7.2.tgz";
+      sha1 = "b401695b615697856529389ae2bc1d0fab197bf4";
     };
     deps = {
-      "resolve-1.1.0" = self.by-version."resolve"."1.1.0";
+      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-resolve"."^1.7.0" =
-    self.by-version."browser-resolve"."1.7.0";
+    self.by-version."browser-resolve"."1.7.2";
+  by-spec."browser-resolve"."^1.7.1" =
+    self.by-version."browser-resolve"."1.7.2";
   by-spec."browser-resolve"."~1.2.1" =
     self.by-version."browser-resolve"."1.2.4";
   by-version."browser-resolve"."1.2.4" = self.buildNodePackage {
     name = "browser-resolve-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
@@ -3544,7 +4711,11 @@
     deps = {
       "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browser-resolve"."~1.2.2" =
     self.by-version."browser-resolve"."1.2.4";
@@ -3552,6 +4723,7 @@
     self.by-version."browserchannel"."2.0.0";
   by-version."browserchannel"."2.0.0" = self.buildNodePackage {
     name = "browserchannel-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
@@ -3564,46 +4736,52 @@
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."8.1.3";
-  by-version."browserify"."8.1.3" = self.buildNodePackage {
-    name = "browserify-8.1.3";
+    self.by-version."browserify"."9.0.3";
+  by-version."browserify"."9.0.3" = self.buildNodePackage {
+    name = "browserify-9.0.3";
+    version = "9.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz";
-      name = "browserify-8.1.3.tgz";
-      sha1 = "f33a549a3a6c368219b075fdcfe6df195e049a9a";
+      url = "http://registry.npmjs.org/browserify/-/browserify-9.0.3.tgz";
+      name = "browserify-9.0.3.tgz";
+      sha1 = "f2f742b82ec5631c64b8c98a9788db0017c6517c";
     };
     deps = {
-      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+      "JSONStream-0.10.0" = self.by-version."JSONStream"."0.10.0";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
-      "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0";
+      "browser-pack-4.0.0" = self.by-version."browser-pack"."4.0.0";
+      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.0.2" = self.by-version."buffer"."3.0.2";
+      "buffer-3.0.3" = self.by-version."buffer"."3.0.3";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
       "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12";
-      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
+      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
       "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
       "glob-4.4.0" = self.by-version."glob"."4.4.0";
+      "has-1.0.0" = self.by-version."has"."1.0.0";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1";
+      "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
@@ -3611,7 +4789,7 @@
       "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
       "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
@@ -3622,19 +4800,23 @@
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
       "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "umd-2.1.0" = self.by-version."umd"."2.1.0";
       "url-0.10.2" = self.by-version."url"."0.10.2";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "browserify" = self.by-version."browserify"."8.1.3";
+  "browserify" = self.by-version."browserify"."9.0.3";
   by-spec."browserify"."7.1.0" =
     self.by-version."browserify"."7.1.0";
   by-version."browserify"."7.1.0" = self.buildNodePackage {
     name = "browserify-7.1.0";
+    version = "7.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz";
@@ -3645,9 +4827,9 @@
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "assert-1.1.2" = self.by-version."assert"."1.1.2";
       "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0";
+      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.0.2" = self.by-version."buffer"."3.0.2";
+      "buffer-3.0.3" = self.by-version."buffer"."3.0.3";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
@@ -3667,7 +4849,7 @@
       "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1";
+      "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-0.0.3" = self.by-version."parents"."0.0.3";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
@@ -3692,12 +4874,17 @@
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify"."~3.19.1" =
     self.by-version."browserify"."3.19.1";
   by-version."browserify"."3.19.1" = self.buildNodePackage {
     name = "browserify-3.19.1";
+    version = "3.19.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz";
@@ -3745,12 +4932,17 @@
       "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify"."~3.24.1" =
     self.by-version."browserify"."3.24.13";
   by-version."browserify"."3.24.13" = self.buildNodePackage {
     name = "browserify-3.24.13";
+    version = "3.24.13";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz";
@@ -3801,12 +4993,37 @@
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browserify-aes"."0.4.0" =
+    self.by-version."browserify-aes"."0.4.0";
+  by-version."browserify-aes"."0.4.0" = self.buildNodePackage {
+    name = "browserify-aes-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+      name = "browserify-aes-0.4.0.tgz";
+      sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify-aes"."^1.0.0" =
     self.by-version."browserify-aes"."1.0.0";
   by-version."browserify-aes"."1.0.0" = self.buildNodePackage {
     name = "browserify-aes-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz";
@@ -3817,12 +5034,17 @@
       "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify-rsa"."^1.1.0" =
     self.by-version."browserify-rsa"."1.1.1";
   by-version."browserify-rsa"."1.1.1" = self.buildNodePackage {
     name = "browserify-rsa-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz";
@@ -3832,12 +5054,17 @@
     deps = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify-sign"."2.8.0" =
     self.by-version."browserify-sign"."2.8.0";
   by-version."browserify-sign"."2.8.0" = self.buildNodePackage {
     name = "browserify-sign-2.8.0";
+    version = "2.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz";
@@ -3851,12 +5078,17 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify-zlib"."^0.1.4" =
     self.by-version."browserify-zlib"."0.1.4";
   by-version."browserify-zlib"."0.1.4" = self.buildNodePackage {
     name = "browserify-zlib-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
@@ -3866,14 +5098,21 @@
     deps = {
       "pako-0.2.5" = self.by-version."pako"."0.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."browserify-zlib"."~0.1.2" =
     self.by-version."browserify-zlib"."0.1.4";
+  by-spec."browserify-zlib"."~0.1.4" =
+    self.by-version."browserify-zlib"."0.1.4";
   by-spec."bs58"."^2.0.0" =
     self.by-version."bs58"."2.0.1";
   by-version."bs58"."2.0.1" = self.buildNodePackage {
     name = "bs58-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz";
@@ -3882,12 +5121,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bs58check"."1.0.3" =
     self.by-version."bs58check"."1.0.3";
   by-version."bs58check"."1.0.3" = self.buildNodePackage {
     name = "bs58check-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bs58check/-/bs58check-1.0.3.tgz";
@@ -3897,12 +5141,17 @@
     deps = {
       "bs58-2.0.1" = self.by-version."bs58"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = self.buildNodePackage {
     name = "bson-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
@@ -3911,12 +5160,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bson"."0.2.19" =
     self.by-version."bson"."0.2.19";
   by-version."bson"."0.2.19" = self.buildNodePackage {
     name = "bson-0.2.19";
+    version = "0.2.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bson/-/bson-0.2.19.tgz";
@@ -3926,12 +5180,17 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bson"."0.2.2" =
     self.by-version."bson"."0.2.2";
   by-version."bson"."0.2.2" = self.buildNodePackage {
     name = "bson-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
@@ -3940,31 +5199,63 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bson"."~0.2" =
     self.by-version."bson"."0.2.19";
-  by-spec."buffer"."^3.0.0" =
-    self.by-version."buffer"."3.0.2";
-  by-version."buffer"."3.0.2" = self.buildNodePackage {
-    name = "buffer-3.0.2";
+  by-spec."buffer"."^2.3.0" =
+    self.by-version."buffer"."2.8.2";
+  by-version."buffer"."2.8.2" = self.buildNodePackage {
+    name = "buffer-2.8.2";
+    version = "2.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer/-/buffer-3.0.2.tgz";
-      name = "buffer-3.0.2.tgz";
-      sha1 = "4f6513750dbe278300fa903da9d7b4b1745b480e";
+      url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz";
+      name = "buffer-2.8.2.tgz";
+      sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7";
+    };
+    deps = {
+      "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7";
+      "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
+      "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer"."^3.0.0" =
+    self.by-version."buffer"."3.0.3";
+  by-version."buffer"."3.0.3" = self.buildNodePackage {
+    name = "buffer-3.0.3";
+    version = "3.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer/-/buffer-3.0.3.tgz";
+      name = "buffer-3.0.3.tgz";
+      sha1 = "93d8a236e8ee37941cdaf801eb8cd4117192ece6";
     };
     deps = {
       "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
       "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
       "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = self.buildNodePackage {
     name = "buffer-crc32-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
@@ -3973,12 +5264,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-crc32"."0.2.1" =
     self.by-version."buffer-crc32"."0.2.1";
   by-version."buffer-crc32"."0.2.1" = self.buildNodePackage {
     name = "buffer-crc32-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
@@ -3987,12 +5283,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-crc32"."0.2.3" =
     self.by-version."buffer-crc32"."0.2.3";
   by-version."buffer-crc32"."0.2.3" = self.buildNodePackage {
     name = "buffer-crc32-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
@@ -4001,12 +5302,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-crc32"."~0.2.1" =
     self.by-version."buffer-crc32"."0.2.5";
   by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
     name = "buffer-crc32-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
@@ -4015,12 +5321,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-equal"."0.0.1" =
     self.by-version."buffer-equal"."0.0.1";
   by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
     name = "buffer-equal-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
@@ -4029,7 +5340,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffer-equal"."^0.0.1" =
     self.by-version."buffer-equal"."0.0.1";
@@ -4039,6 +5354,7 @@
     self.by-version."buffercursor"."0.0.12";
   by-version."buffercursor"."0.0.12" = self.buildNodePackage {
     name = "buffercursor-0.0.12";
+    version = "0.0.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
@@ -4048,12 +5364,17 @@
     deps = {
       "verror-1.6.0" = self.by-version."verror"."1.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffers"."~0.1.1" =
     self.by-version."buffers"."0.1.1";
   by-version."buffers"."0.1.1" = self.buildNodePackage {
     name = "buffers-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
@@ -4062,12 +5383,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."buffertools"."*" =
     self.by-version."buffertools"."2.1.2";
   by-version."buffertools"."2.1.2" = self.buildNodePackage {
     name = "buffertools-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
@@ -4076,27 +5402,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "buffertools" = self.by-version."buffertools"."2.1.2";
-  by-spec."buffertools".">=1.1.1 <2.0.0" =
-    self.by-version."buffertools"."1.1.1";
-  by-version."buffertools"."1.1.1" = self.buildNodePackage {
-    name = "buffertools-1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
-      name = "buffertools-1.1.1.tgz";
-      sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
   by-spec."bufferutil"."1.0.x" =
     self.by-version."bufferutil"."1.0.1";
   by-version."bufferutil"."1.0.1" = self.buildNodePackage {
     name = "bufferutil-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz";
@@ -4107,12 +5424,17 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bufferview"."~1" =
     self.by-version."bufferview"."1.0.1";
   by-version."bufferview"."1.0.1" = self.buildNodePackage {
     name = "bufferview-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz";
@@ -4121,12 +5443,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buildmail"."^1.2.0" =
+    self.by-version."buildmail"."1.2.0";
+  by-version."buildmail"."1.2.0" = self.buildNodePackage {
+    name = "buildmail-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buildmail/-/buildmail-1.2.0.tgz";
+      name = "buildmail-1.2.0.tgz";
+      sha1 = "9434eefe177fc496a23e605f51ceb38da3a6cee6";
+    };
+    deps = {
+      "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
+      "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0";
+      "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
+      "libmime-0.1.7" = self.by-version."libmime"."0.1.7";
+      "libqp-0.1.1" = self.by-version."libqp"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."builtins"."~0.0.3" =
     self.by-version."builtins"."0.0.7";
   by-version."builtins"."0.0.7" = self.buildNodePackage {
     name = "builtins-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
@@ -4135,12 +5486,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bunker"."0.1.X" =
     self.by-version."bunker"."0.1.2";
   by-version."bunker"."0.1.2" = self.buildNodePackage {
     name = "bunker-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
@@ -4150,12 +5506,17 @@
     deps = {
       "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bunyan"."0.21.1" =
     self.by-version."bunyan"."0.21.1";
   by-version."bunyan"."0.21.1" = self.buildNodePackage {
     name = "bunyan-0.21.1";
+    version = "0.21.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
@@ -4163,15 +5524,20 @@
       sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
     };
     deps = {
+    };
+    optionalDependencies = {
       "mv-0.0.5" = self.by-version."mv"."0.0.5";
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bunyan"."0.22.1" =
     self.by-version."bunyan"."0.22.1";
   by-version."bunyan"."0.22.1" = self.buildNodePackage {
     name = "bunyan-0.22.1";
+    version = "0.22.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
@@ -4179,31 +5545,20 @@
       sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c";
     };
     deps = {
+    };
+    optionalDependencies = {
       "mv-0.0.5" = self.by-version."mv"."0.0.5";
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
-  };
-  by-spec."bunyan"."~0.22.0" =
-    self.by-version."bunyan"."0.22.3";
-  by-version."bunyan"."0.22.3" = self.buildNodePackage {
-    name = "bunyan-0.22.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.3.tgz";
-      name = "bunyan-0.22.3.tgz";
-      sha1 = "7a19dc1b4c8c645f740241a740f2245147c67ec2";
-    };
-    deps = {
-      "mv-2.0.3" = self.by-version."mv"."2.0.3";
-      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
-    };
-    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bunyan"."~1.0.0" =
     self.by-version."bunyan"."1.0.1";
   by-version."bunyan"."1.0.1" = self.buildNodePackage {
     name = "bunyan-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/bunyan/-/bunyan-1.0.1.tgz";
@@ -4211,28 +5566,19 @@
       sha1 = "9916a8c1832020c2d095656d923da5963db05466";
     };
     deps = {
+    };
+    optionalDependencies = {
       "mv-2.0.3" = self.by-version."mv"."2.0.3";
     };
     peerDependencies = [];
-  };
-  by-spec."bunyan-prettystream"."~0.1.3" =
-    self.by-version."bunyan-prettystream"."0.1.3";
-  by-version."bunyan-prettystream"."0.1.3" = self.buildNodePackage {
-    name = "bunyan-prettystream-0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan-prettystream/-/bunyan-prettystream-0.1.3.tgz";
-      name = "bunyan-prettystream-0.1.3.tgz";
-      sha1 = "6c3b713266f6ad32007c7b6ab1e998a245349d98";
-    };
-    deps = {
-    };
-    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."burrito".">=0.2.5 <0.3" =
     self.by-version."burrito"."0.2.12";
   by-version."burrito"."0.2.12" = self.buildNodePackage {
     name = "burrito-0.2.12";
+    version = "0.2.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
@@ -4243,12 +5589,17 @@
       "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
       "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."busboy"."~0.2.9" =
     self.by-version."busboy"."0.2.9";
   by-version."busboy"."0.2.9" = self.buildNodePackage {
     name = "busboy-0.2.9";
+    version = "0.2.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/busboy/-/busboy-0.2.9.tgz";
@@ -4259,12 +5610,17 @@
       "dicer-0.2.3" = self.by-version."dicer"."0.2.3";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytebuffer"."~3 >=3.5" =
     self.by-version."bytebuffer"."3.5.4";
   by-version."bytebuffer"."3.5.4" = self.buildNodePackage {
     name = "bytebuffer-3.5.4";
+    version = "3.5.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.4.tgz";
@@ -4275,12 +5631,17 @@
       "long-2.2.3" = self.by-version."long"."2.2.3";
       "bufferview-1.0.1" = self.by-version."bufferview"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = self.buildNodePackage {
     name = "bytes-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
@@ -4289,12 +5650,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."0.2.0" =
     self.by-version."bytes"."0.2.0";
   by-version."bytes"."0.2.0" = self.buildNodePackage {
     name = "bytes-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
@@ -4303,12 +5669,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."0.2.1" =
     self.by-version."bytes"."0.2.1";
   by-version."bytes"."0.2.1" = self.buildNodePackage {
     name = "bytes-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
@@ -4317,12 +5688,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."0.3.0" =
     self.by-version."bytes"."0.3.0";
   by-version."bytes"."0.3.0" = self.buildNodePackage {
     name = "bytes-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
@@ -4331,12 +5707,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."1" =
     self.by-version."bytes"."1.0.0";
   by-version."bytes"."1.0.0" = self.buildNodePackage {
     name = "bytes-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
@@ -4345,7 +5726,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bytes"."1.0.0" =
     self.by-version."bytes"."1.0.0";
@@ -4357,6 +5742,7 @@
     self.by-version."callsite"."1.0.0";
   by-version."callsite"."1.0.0" = self.buildNodePackage {
     name = "callsite-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
@@ -4365,7 +5751,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."callsite"."~1.0.0" =
     self.by-version."callsite"."1.0.0";
@@ -4373,6 +5763,7 @@
     self.by-version."camelcase"."1.0.2";
   by-version."camelcase"."1.0.2" = self.buildNodePackage {
     name = "camelcase-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz";
@@ -4381,12 +5772,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."camelcase-keys"."^1.0.0" =
     self.by-version."camelcase-keys"."1.0.0";
   by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
     name = "camelcase-keys-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
@@ -4397,12 +5793,17 @@
       "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
       "map-obj-1.0.0" = self.by-version."map-obj"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cardinal"."0.4.0" =
     self.by-version."cardinal"."0.4.0";
   by-version."cardinal"."0.4.0" = self.buildNodePackage {
     name = "cardinal-0.4.0";
+    version = "0.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz";
@@ -4412,12 +5813,17 @@
     deps = {
       "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."caseless"."~0.6.0" =
     self.by-version."caseless"."0.6.0";
   by-version."caseless"."0.6.0" = self.buildNodePackage {
     name = "caseless-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
@@ -4426,12 +5832,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."caseless"."~0.7.0" =
     self.by-version."caseless"."0.7.0";
   by-version."caseless"."0.7.0" = self.buildNodePackage {
     name = "caseless-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz";
@@ -4440,12 +5851,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."caseless"."~0.8.0" =
     self.by-version."caseless"."0.8.0";
   by-version."caseless"."0.8.0" = self.buildNodePackage {
     name = "caseless-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
@@ -4454,12 +5870,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."caseless"."~0.9.0" =
     self.by-version."caseless"."0.9.0";
   by-version."caseless"."0.9.0" = self.buildNodePackage {
     name = "caseless-0.9.0";
+    version = "0.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
@@ -4468,23 +5889,28 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."castnow"."*" =
-    self.by-version."castnow"."0.4.9";
-  by-version."castnow"."0.4.9" = self.buildNodePackage {
-    name = "castnow-0.4.9";
+    self.by-version."castnow"."0.4.12";
+  by-version."castnow"."0.4.12" = self.buildNodePackage {
+    name = "castnow-0.4.12";
+    version = "0.4.12";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.9.tgz";
-      name = "castnow-0.4.9.tgz";
-      sha1 = "a9d4e42614c29c09f4dfdebcf52f34c7ea37865e";
+      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.12.tgz";
+      name = "castnow-0.4.12.tgz";
+      sha1 = "048a351420a5e6a68d098d6e8dc6b4abc86d6780";
     };
     deps = {
       "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0";
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "chromecast-player-0.1.9" = self.by-version."chromecast-player"."0.1.9";
+      "chromecast-player-0.1.10" = self.by-version."chromecast-player"."0.1.10";
       "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "fs-extended-0.2.0" = self.by-version."fs-extended"."0.2.0";
@@ -4494,7 +5920,7 @@
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
-      "peerflix-0.19.3" = self.by-version."peerflix"."0.19.3";
+      "peerflix-0.25.2" = self.by-version."peerflix"."0.25.2";
       "playerui-1.2.0" = self.by-version."playerui"."1.2.0";
       "query-string-1.0.0" = self.by-version."query-string"."1.0.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
@@ -4505,13 +5931,18 @@
       "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "castnow" = self.by-version."castnow"."0.4.9";
+  "castnow" = self.by-version."castnow"."0.4.12";
   by-spec."castv2"."~0.1.4" =
     self.by-version."castv2"."0.1.4";
   by-version."castv2"."0.1.4" = self.buildNodePackage {
     name = "castv2-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/castv2/-/castv2-0.1.4.tgz";
@@ -4522,12 +5953,17 @@
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."castv2-client"."0.0.8" =
     self.by-version."castv2-client"."0.0.8";
   by-version."castv2-client"."0.0.8" = self.buildNodePackage {
     name = "castv2-client-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/castv2-client/-/castv2-client-0.0.8.tgz";
@@ -4538,12 +5974,17 @@
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "castv2-0.1.4" = self.by-version."castv2"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chai"."*" =
     self.by-version."chai"."2.0.0";
   by-version."chai"."2.0.0" = self.buildNodePackage {
     name = "chai-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chai/-/chai-2.0.0.tgz";
@@ -4554,13 +5995,18 @@
       "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
       "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "chai" = self.by-version."chai"."2.0.0";
   by-spec."chain-node".">=0.0.17" =
     self.by-version."chain-node"."3.1.0";
   by-version."chain-node"."3.1.0" = self.buildNodePackage {
     name = "chain-node-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chain-node/-/chain-node-3.1.0.tgz";
@@ -4572,12 +6018,17 @@
       "bitcoinjs-lib-1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0";
       "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chainsaw"."~0.1.0" =
     self.by-version."chainsaw"."0.1.0";
   by-version."chainsaw"."0.1.0" = self.buildNodePackage {
     name = "chainsaw-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
@@ -4587,12 +6038,17 @@
     deps = {
       "traverse-0.3.9" = self.by-version."traverse"."0.3.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chalk"."0.5.0" =
     self.by-version."chalk"."0.5.0";
   by-version."chalk"."0.5.0" = self.buildNodePackage {
     name = "chalk-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz";
@@ -4601,17 +6057,22 @@
     };
     deps = {
       "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
-      "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
       "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
       "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
       "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chalk"."^0.5.0" =
     self.by-version."chalk"."0.5.1";
   by-version."chalk"."0.5.1" = self.buildNodePackage {
     name = "chalk-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
@@ -4620,12 +6081,16 @@
     };
     deps = {
       "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
-      "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
       "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
       "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
       "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chalk"."^0.5.1" =
     self.by-version."chalk"."0.5.1";
@@ -4633,6 +6098,7 @@
     self.by-version."char-spinner"."1.0.1";
   by-version."char-spinner"."1.0.1" = self.buildNodePackage {
     name = "char-spinner-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
@@ -4641,12 +6107,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
   by-version."character-parser"."1.2.0" = self.buildNodePackage {
     name = "character-parser-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
@@ -4655,12 +6126,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."character-parser"."1.2.1" =
     self.by-version."character-parser"."1.2.1";
   by-version."character-parser"."1.2.1" = self.buildNodePackage {
     name = "character-parser-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
@@ -4669,12 +6145,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."charm"."0.1.x" =
     self.by-version."charm"."0.1.2";
   by-version."charm"."0.1.2" = self.buildNodePackage {
     name = "charm-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
@@ -4683,12 +6164,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cheerio"."0.18.0" =
+    self.by-version."cheerio"."0.18.0";
+  by-version."cheerio"."0.18.0" = self.buildNodePackage {
+    name = "cheerio-0.18.0";
+    version = "0.18.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
+      name = "cheerio-0.18.0.tgz";
+      sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
+    };
+    deps = {
+      "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
+      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cheerio"."^0.17.0" =
     self.by-version."cheerio"."0.17.0";
   by-version."cheerio"."0.17.0" = self.buildNodePackage {
     name = "cheerio-0.17.0";
+    version = "0.17.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
@@ -4702,12 +6212,17 @@
       "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."child-process-close"."~0.1.1" =
     self.by-version."child-process-close"."0.1.1";
   by-version."child-process-close"."0.1.1" = self.buildNodePackage {
     name = "child-process-close-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
@@ -4716,12 +6231,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chmodr"."0.1.0" =
     self.by-version."chmodr"."0.1.0";
   by-version."chmodr"."0.1.0" = self.buildNodePackage {
     name = "chmodr-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
@@ -4730,14 +6250,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chmodr"."~0.1.0" =
     self.by-version."chmodr"."0.1.0";
   by-spec."chokidar".">=0.8.2" =
+    self.by-version."chokidar"."0.12.6";
+  by-version."chokidar"."0.12.6" = self.buildNodePackage {
+    name = "chokidar-0.12.6";
+    version = "0.12.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz";
+      name = "chokidar-0.12.6.tgz";
+      sha1 = "be204f5b9634e009311256e5d6e8e0e508284d2f";
+    };
+    deps = {
+      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
+      "async-each-0.1.6" = self.by-version."async-each"."0.1.6";
+    };
+    optionalDependencies = {
+      "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chokidar"."^1.0.0-rc2" =
     self.by-version."chokidar"."1.0.0-rc3";
   by-version."chokidar"."1.0.0-rc3" = self.buildNodePackage {
     name = "chokidar-1.0.0-rc3";
+    version = "1.0.0-rc3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc3.tgz";
@@ -4750,14 +6297,19 @@
       "glob-parent-1.0.0" = self.by-version."glob-parent"."1.0.0";
       "is-binary-path-1.0.0" = self.by-version."is-binary-path"."1.0.0";
       "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
+    };
+    optionalDependencies = {
       "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."chownr"."0" =
     self.by-version."chownr"."0.0.1";
   by-version."chownr"."0.0.1" = self.buildNodePackage {
     name = "chownr-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
@@ -4766,51 +6318,64 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."chromecast-player"."0.1.9" =
-    self.by-version."chromecast-player"."0.1.9";
-  by-version."chromecast-player"."0.1.9" = self.buildNodePackage {
-    name = "chromecast-player-0.1.9";
+  by-spec."chromecast-player"."^0.1.10" =
+    self.by-version."chromecast-player"."0.1.10";
+  by-version."chromecast-player"."0.1.10" = self.buildNodePackage {
+    name = "chromecast-player-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.9.tgz";
-      name = "chromecast-player-0.1.9.tgz";
-      sha1 = "854d4264822347b3163ece8c8da2481390a0294e";
+      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.10.tgz";
+      name = "chromecast-player-0.1.10.tgz";
+      sha1 = "c5180f693d50119d824f81f388fe55bc2026844f";
     };
     deps = {
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
-      "chromecast-scanner-0.2.0" = self.by-version."chromecast-scanner"."0.2.0";
+      "chromecast-scanner-0.3.0" = self.by-version."chromecast-scanner"."0.3.0";
       "mutate.js-0.2.0" = self.by-version."mutate.js"."0.2.0";
       "promiscuous-0.6.0" = self.by-version."promiscuous"."0.6.0";
       "time-line-1.0.1" = self.by-version."time-line"."1.0.1";
       "ware-1.2.0" = self.by-version."ware"."1.2.0";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."chromecast-scanner"."0.2.0" =
-    self.by-version."chromecast-scanner"."0.2.0";
-  by-version."chromecast-scanner"."0.2.0" = self.buildNodePackage {
-    name = "chromecast-scanner-0.2.0";
+  by-spec."chromecast-scanner"."0.3.0" =
+    self.by-version."chromecast-scanner"."0.3.0";
+  by-version."chromecast-scanner"."0.3.0" = self.buildNodePackage {
+    name = "chromecast-scanner-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.2.0.tgz";
-      name = "chromecast-scanner-0.2.0.tgz";
-      sha1 = "5b1f17aa92cf382bc413471d9b66caaf16d45d0e";
+      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.3.0.tgz";
+      name = "chromecast-scanner-0.3.0.tgz";
+      sha1 = "5e5bab3d8020ab5a8e868f967ebbdca2361c08f9";
     };
     deps = {
-      "got-2.4.0" = self.by-version."got"."2.4.0";
       "mdns-js-0.2.9" = self.by-version."mdns-js"."0.2.9";
-      "node-ssdp-2.0.1" = self.by-version."node-ssdp"."2.0.1";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cint"."^8.2.1" =
     self.by-version."cint"."8.2.1";
   by-version."cint"."8.2.1" = self.buildNodePackage {
     name = "cint-8.2.1";
+    version = "8.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cint/-/cint-8.2.1.tgz";
@@ -4819,12 +6384,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."clean-css"."^3.0.1" =
     self.by-version."clean-css"."3.0.10";
   by-version."clean-css"."3.0.10" = self.buildNodePackage {
     name = "clean-css-3.0.10";
+    version = "3.0.10";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.10.tgz";
@@ -4835,12 +6405,17 @@
       "commander-2.5.1" = self.by-version."commander"."2.5.1";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cli"."0.6.x" =
     self.by-version."cli"."0.6.5";
   by-version."cli"."0.6.5" = self.buildNodePackage {
     name = "cli-0.6.5";
+    version = "0.6.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz";
@@ -4851,12 +6426,17 @@
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cli-color"."~0.3.2" =
     self.by-version."cli-color"."0.3.2";
   by-version."cli-color"."0.3.2" = self.buildNodePackage {
     name = "cli-color-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz";
@@ -4869,12 +6449,17 @@
       "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8";
       "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cli-table"."^0.3.1" =
     self.by-version."cli-table"."0.3.1";
   by-version."cli-table"."0.3.1" = self.buildNodePackage {
     name = "cli-table-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
@@ -4884,12 +6469,17 @@
     deps = {
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
   by-version."cliff"."0.1.8" = self.buildNodePackage {
     name = "cliff-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
@@ -4901,12 +6491,17 @@
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.6.2" = self.by-version."winston"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cliff"."0.1.9" =
     self.by-version."cliff"."0.1.9";
   by-version."cliff"."0.1.9" = self.buildNodePackage {
     name = "cliff-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
@@ -4918,12 +6513,17 @@
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cliff"."~0.1.9" =
     self.by-version."cliff"."0.1.10";
   by-version."cliff"."0.1.10" = self.buildNodePackage {
     name = "cliff-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
@@ -4935,12 +6535,17 @@
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."clivas"."^0.1.4" =
     self.by-version."clivas"."0.1.4";
   by-version."clivas"."0.1.4" = self.buildNodePackage {
     name = "clivas-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz";
@@ -4949,12 +6554,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."clone"."0.1.11" =
     self.by-version."clone"."0.1.11";
   by-version."clone"."0.1.11" = self.buildNodePackage {
     name = "clone-0.1.11";
+    version = "0.1.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
@@ -4963,12 +6573,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."clone"."0.1.5" =
     self.by-version."clone"."0.1.5";
   by-version."clone"."0.1.5" = self.buildNodePackage {
     name = "clone-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
@@ -4977,12 +6592,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."clone"."0.1.6" =
     self.by-version."clone"."0.1.6";
   by-version."clone"."0.1.6" = self.buildNodePackage {
     name = "clone-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
@@ -4991,26 +6611,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."clone".">=0.1.0" =
-    self.by-version."clone"."1.0.0";
-  by-version."clone"."1.0.0" = self.buildNodePackage {
-    name = "clone-1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-1.0.0.tgz";
-      name = "clone-1.0.0.tgz";
-      sha1 = "bde24f2ee7c478a409fc8a118ae2fcd44deb7f9e";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."clone"."^0.2.0" =
+  by-spec."clone"."0.2.0" =
     self.by-version."clone"."0.2.0";
   by-version."clone"."0.2.0" = self.buildNodePackage {
     name = "clone-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
@@ -5019,12 +6630,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."clone"."~0.1.5" =
+  by-spec."clone".">=0.1.0" =
+    self.by-version."clone"."1.0.0";
+  by-version."clone"."1.0.0" = self.buildNodePackage {
+    name = "clone-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-1.0.0.tgz";
+      name = "clone-1.0.0.tgz";
+      sha1 = "bde24f2ee7c478a409fc8a118ae2fcd44deb7f9e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."clone"."^0.2.0" =
+    self.by-version."clone"."0.2.0";
+  by-spec."clone"."~0.1.15" =
     self.by-version."clone"."0.1.19";
   by-version."clone"."0.1.19" = self.buildNodePackage {
     name = "clone-0.1.19";
+    version = "0.1.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
@@ -5033,14 +6670,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."clone"."~0.1.5" =
+    self.by-version."clone"."0.1.19";
   by-spec."clone"."~0.2.0" =
     self.by-version."clone"."0.2.0";
   by-spec."clone-stats"."^0.0.1" =
     self.by-version."clone-stats"."0.0.1";
   by-version."clone-stats"."0.0.1" = self.buildNodePackage {
     name = "clone-stats-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
@@ -5049,12 +6693,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."closest-package"."^1.0.0" =
     self.by-version."closest-package"."1.0.0";
   by-version."closest-package"."1.0.0" = self.buildNodePackage {
     name = "closest-package-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/closest-package/-/closest-package-1.0.0.tgz";
@@ -5063,26 +6712,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."cls"."~0.1.3" =
-    self.by-version."cls"."0.1.5";
-  by-version."cls"."0.1.5" = self.buildNodePackage {
-    name = "cls-0.1.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cls/-/cls-0.1.5.tgz";
-      name = "cls-0.1.5.tgz";
-      sha1 = "df3218cf9d1480747f584d88b19b74c6b281317b";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cmd-shim"."2.0.0" =
     self.by-version."cmd-shim"."2.0.0";
   by-version."cmd-shim"."2.0.0" = self.buildNodePackage {
     name = "cmd-shim-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.0.tgz";
@@ -5090,15 +6730,20 @@
       sha1 = "34e0cd2ede0505cd8b154667eee9054ee24006b4";
     };
     deps = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
+    optionalDependencies = {
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cmd-shim"."~2.0.1" =
     self.by-version."cmd-shim"."2.0.1";
   by-version."cmd-shim"."2.0.1" = self.buildNodePackage {
     name = "cmd-shim-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz";
@@ -5109,12 +6754,17 @@
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cmdln"."1.3.2" =
     self.by-version."cmdln"."1.3.2";
   by-version."cmdln"."1.3.2" = self.buildNodePackage {
     name = "cmdln-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
@@ -5127,12 +6777,17 @@
       "verror-1.3.6" = self.by-version."verror"."1.3.6";
       "dashdash-1.3.2" = self.by-version."dashdash"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."co"."3.1.0" =
     self.by-version."co"."3.1.0";
   by-version."co"."3.1.0" = self.buildNodePackage {
     name = "co-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
@@ -5141,12 +6796,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."co"."~3.0.6" =
     self.by-version."co"."3.0.6";
   by-version."co"."3.0.6" = self.buildNodePackage {
     name = "co-3.0.6";
+    version = "3.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz";
@@ -5155,12 +6815,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."codepage"."~1.3.4" =
     self.by-version."codepage"."1.3.8";
   by-version."codepage"."1.3.8" = self.buildNodePackage {
     name = "codepage-1.3.8";
+    version = "1.3.8";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz";
@@ -5172,27 +6837,37 @@
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."coffee-script"."*" =
-    self.by-version."coffee-script"."1.9.0";
-  by-version."coffee-script"."1.9.0" = self.buildNodePackage {
-    name = "coffee-script-1.9.0";
+    self.by-version."coffee-script"."1.9.1";
+  by-version."coffee-script"."1.9.1" = self.buildNodePackage {
+    name = "coffee-script-1.9.1";
+    version = "1.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.0.tgz";
-      name = "coffee-script-1.9.0.tgz";
-      sha1 = "7492cbbc3f0361cc5d8865aff7237552ff33e1f7";
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.1.tgz";
+      name = "coffee-script-1.9.1.tgz";
+      sha1 = "c458d02200f460d064a79cb6ab1ee6e2c9ca1c31";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "coffee-script" = self.by-version."coffee-script"."1.9.0";
+  "coffee-script" = self.by-version."coffee-script"."1.9.1";
   by-spec."coffee-script"."1.6.3" =
     self.by-version."coffee-script"."1.6.3";
   by-version."coffee-script"."1.6.3" = self.buildNodePackage {
     name = "coffee-script-1.6.3";
+    version = "1.6.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
@@ -5201,18 +6876,23 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."coffee-script".">= 0.0.1" =
-    self.by-version."coffee-script"."1.9.0";
+    self.by-version."coffee-script"."1.9.1";
   by-spec."coffee-script".">=1.2.0" =
-    self.by-version."coffee-script"."1.9.0";
+    self.by-version."coffee-script"."1.9.1";
   by-spec."coffee-script".">=1.6.2 <2.0.0" =
-    self.by-version."coffee-script"."1.9.0";
+    self.by-version."coffee-script"."1.9.1";
   by-spec."coffee-script"."~1.3.3" =
     self.by-version."coffee-script"."1.3.3";
   by-version."coffee-script"."1.3.3" = self.buildNodePackage {
     name = "coffee-script-1.3.3";
+    version = "1.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
@@ -5221,12 +6901,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."coffee-script"."~1.8.0" =
     self.by-version."coffee-script"."1.8.0";
   by-version."coffee-script"."1.8.0" = self.buildNodePackage {
     name = "coffee-script-1.8.0";
+    version = "1.8.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
@@ -5236,12 +6921,17 @@
     deps = {
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."color"."~0.7.3" =
     self.by-version."color"."0.7.3";
   by-version."color"."0.7.3" = self.buildNodePackage {
     name = "color-0.7.3";
+    version = "0.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz";
@@ -5252,12 +6942,17 @@
       "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2";
       "color-string-0.2.4" = self.by-version."color-string"."0.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."color-convert"."0.5.x" =
     self.by-version."color-convert"."0.5.2";
   by-version."color-convert"."0.5.2" = self.buildNodePackage {
     name = "color-convert-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz";
@@ -5266,12 +6961,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."color-name"."1.0.x" =
     self.by-version."color-name"."1.0.0";
   by-version."color-name"."1.0.0" = self.buildNodePackage {
     name = "color-name-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz";
@@ -5280,12 +6980,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."color-string"."0.2.x" =
     self.by-version."color-string"."0.2.4";
   by-version."color-string"."0.2.4" = self.buildNodePackage {
     name = "color-string-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz";
@@ -5295,12 +7000,17 @@
     deps = {
       "color-name-1.0.0" = self.by-version."color-name"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."0.5.x" =
     self.by-version."colors"."0.5.1";
   by-version."colors"."0.5.1" = self.buildNodePackage {
     name = "colors-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
@@ -5309,12 +7019,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
   by-version."colors"."0.6.2" = self.buildNodePackage {
     name = "colors-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
@@ -5323,7 +7038,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."0.x.x" =
     self.by-version."colors"."0.6.2";
@@ -5331,6 +7050,7 @@
     self.by-version."colors"."1.0.3";
   by-version."colors"."1.0.3" = self.buildNodePackage {
     name = "colors-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
@@ -5339,7 +7059,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."1.0.x" =
     self.by-version."colors"."1.0.3";
@@ -5351,6 +7075,7 @@
     self.by-version."colour"."0.7.1";
   by-version."colour"."0.7.1" = self.buildNodePackage {
     name = "colour-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
@@ -5359,12 +7084,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."columnify"."~1.2.1" =
     self.by-version."columnify"."1.2.1";
   by-version."columnify"."1.2.1" = self.buildNodePackage {
     name = "columnify-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz";
@@ -5375,12 +7105,17 @@
       "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0";
       "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."columnify"."~1.4.1" =
     self.by-version."columnify"."1.4.1";
   by-version."columnify"."1.4.1" = self.buildNodePackage {
     name = "columnify-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/columnify/-/columnify-1.4.1.tgz";
@@ -5391,12 +7126,17 @@
       "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
       "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."combine-source-map"."~0.3.0" =
     self.by-version."combine-source-map"."0.3.0";
   by-version."combine-source-map"."0.3.0" = self.buildNodePackage {
     name = "combine-source-map-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
@@ -5404,16 +7144,21 @@
       sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
     };
     deps = {
-      "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0";
+      "inline-source-map-0.3.1" = self.by-version."inline-source-map"."0.3.1";
       "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.7";
   by-version."combined-stream"."0.0.7" = self.buildNodePackage {
     name = "combined-stream-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
@@ -5423,7 +7168,11 @@
     deps = {
       "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."combined-stream"."~0.0.5" =
     self.by-version."combined-stream"."0.0.7";
@@ -5431,6 +7180,7 @@
     self.by-version."commander"."2.6.0";
   by-version."commander"."2.6.0" = self.buildNodePackage {
     name = "commander-2.6.0";
+    version = "2.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
@@ -5439,12 +7189,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."0.6.1" =
     self.by-version."commander"."0.6.1";
   by-version."commander"."0.6.1" = self.buildNodePackage {
     name = "commander-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
@@ -5453,12 +7208,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
   by-version."commander"."1.3.1" = self.buildNodePackage {
     name = "commander-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
@@ -5468,12 +7228,17 @@
     deps = {
       "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."1.3.2" =
     self.by-version."commander"."1.3.2";
   by-version."commander"."1.3.2" = self.buildNodePackage {
     name = "commander-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
@@ -5483,12 +7248,17 @@
     deps = {
       "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.0.0" =
     self.by-version."commander"."2.0.0";
   by-version."commander"."2.0.0" = self.buildNodePackage {
     name = "commander-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
@@ -5497,12 +7267,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.1.0" =
     self.by-version."commander"."2.1.0";
   by-version."commander"."2.1.0" = self.buildNodePackage {
     name = "commander-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
@@ -5511,12 +7286,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.3.0" =
     self.by-version."commander"."2.3.0";
   by-version."commander"."2.3.0" = self.buildNodePackage {
     name = "commander-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
@@ -5525,12 +7305,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.5.x" =
     self.by-version."commander"."2.5.1";
   by-version."commander"."2.5.1" = self.buildNodePackage {
     name = "commander-2.5.1";
+    version = "2.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
@@ -5539,7 +7324,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.6.0" =
     self.by-version."commander"."2.6.0";
@@ -5563,6 +7352,7 @@
     self.by-version."commondir"."0.0.1";
   by-version."commondir"."0.0.1" = self.buildNodePackage {
     name = "commondir-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
@@ -5571,7 +7361,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commondir"."~0.0.1" =
     self.by-version."commondir"."0.0.1";
@@ -5579,6 +7373,7 @@
     self.by-version."commoner"."0.10.1";
   by-version."commoner"."0.10.1" = self.buildNodePackage {
     name = "commoner-0.10.1";
+    version = "0.10.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/commoner/-/commoner-0.10.1.tgz";
@@ -5596,12 +7391,19 @@
       "install-0.1.8" = self.by-version."install"."0.1.8";
       "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."commoner"."~0.10.0" =
+    self.by-version."commoner"."0.10.1";
   by-spec."compact2string"."^1.2.0" =
     self.by-version."compact2string"."1.4.0";
   by-version."compact2string"."1.4.0" = self.buildNodePackage {
     name = "compact2string-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz";
@@ -5611,12 +7413,17 @@
     deps = {
       "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."component-bind"."1.0.0" =
     self.by-version."component-bind"."1.0.0";
   by-version."component-bind"."1.0.0" = self.buildNodePackage {
     name = "component-bind-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
@@ -5625,12 +7432,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."component-emitter"."1.1.2" =
     self.by-version."component-emitter"."1.1.2";
   by-version."component-emitter"."1.1.2" = self.buildNodePackage {
     name = "component-emitter-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
@@ -5639,12 +7451,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."component-inherit"."0.0.3" =
     self.by-version."component-inherit"."0.0.3";
   by-version."component-inherit"."0.0.3" = self.buildNodePackage {
     name = "component-inherit-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
@@ -5653,12 +7470,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."compress-commons"."~0.1.0" =
     self.by-version."compress-commons"."0.1.6";
   by-version."compress-commons"."0.1.6" = self.buildNodePackage {
     name = "compress-commons-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz";
@@ -5670,12 +7492,17 @@
       "crc32-stream-0.3.2" = self.by-version."crc32-stream"."0.3.2";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."compressible"."1.0.0" =
     self.by-version."compressible"."1.0.0";
   by-version."compressible"."1.0.0" = self.buildNodePackage {
     name = "compressible-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
@@ -5684,12 +7511,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."compressible"."~2.0.1" =
     self.by-version."compressible"."2.0.2";
   by-version."compressible"."2.0.2" = self.buildNodePackage {
     name = "compressible-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz";
@@ -5699,7 +7531,11 @@
     deps = {
       "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."compressible"."~2.0.2" =
     self.by-version."compressible"."2.0.2";
@@ -5707,6 +7543,7 @@
     self.by-version."compression"."1.0.0";
   by-version."compression"."1.0.0" = self.buildNodePackage {
     name = "compression-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
@@ -5718,12 +7555,17 @@
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
       "compressible-1.0.0" = self.by-version."compressible"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."compression"."~1.1.2" =
+  by-spec."compression"."~1.1.0" =
     self.by-version."compression"."1.1.2";
   by-version."compression"."1.1.2" = self.buildNodePackage {
     name = "compression-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
@@ -5738,32 +7580,19 @@
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."compression"."~1.3.1" =
-    self.by-version."compression"."1.3.1";
-  by-version."compression"."1.3.1" = self.buildNodePackage {
-    name = "compression-1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.3.1.tgz";
-      name = "compression-1.3.1.tgz";
-      sha1 = "30986b2f519ba90e57759896301de4955ce00945";
-    };
-    deps = {
-      "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."compression"."~1.1.2" =
+    self.by-version."compression"."1.1.2";
   by-spec."compression"."~1.4.1" =
     self.by-version."compression"."1.4.1";
   by-version."compression"."1.4.1" = self.buildNodePackage {
     name = "compression-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/compression/-/compression-1.4.1.tgz";
@@ -5778,12 +7607,17 @@
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
     name = "concat-map-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
@@ -5792,12 +7626,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."concat-stream"."*" =
     self.by-version."concat-stream"."1.4.7";
   by-version."concat-stream"."1.4.7" = self.buildNodePackage {
     name = "concat-stream-1.4.7";
+    version = "1.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz";
@@ -5809,7 +7648,11 @@
       "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."concat-stream"."^1.4.1" =
     self.by-version."concat-stream"."1.4.7";
@@ -5823,6 +7666,7 @@
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = self.buildNodePackage {
     name = "config-0.4.15";
+    version = "0.4.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
@@ -5831,15 +7675,20 @@
     };
     deps = {
       "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7";
-      "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0";
-      "vows-0.9.0-rc2" = self.by-version."vows"."0.9.0-rc2";
+      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
+      "vows-0.8.1" = self.by-version."vows"."0.8.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."config"."0.4.36" =
     self.by-version."config"."0.4.36";
   by-version."config"."0.4.36" = self.buildNodePackage {
     name = "config-0.4.36";
+    version = "0.4.36";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/config/-/config-0.4.36.tgz";
@@ -5848,12 +7697,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."config-chain"."~1.1.1" =
     self.by-version."config-chain"."1.1.8";
   by-version."config-chain"."1.1.8" = self.buildNodePackage {
     name = "config-chain-1.1.8";
+    version = "1.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
@@ -5864,7 +7718,11 @@
       "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3";
       "ini-1.3.3" = self.by-version."ini"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
@@ -5872,6 +7730,7 @@
     self.by-version."configstore"."0.3.2";
   by-version."configstore"."0.3.2" = self.buildNodePackage {
     name = "configstore-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz";
@@ -5880,7 +7739,7 @@
     };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
-      "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6";
+      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
@@ -5888,7 +7747,11 @@
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
       "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."configstore"."^0.3.1" =
     self.by-version."configstore"."0.3.2";
@@ -5896,6 +7759,7 @@
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = self.buildNodePackage {
     name = "connect-1.9.2";
+    version = "1.9.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
@@ -5907,12 +7771,17 @@
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect"."2.11.0" =
     self.by-version."connect"."2.11.0";
   by-version."connect"."2.11.0" = self.buildNodePackage {
     name = "connect-2.11.0";
+    version = "2.11.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
@@ -5935,12 +7804,17 @@
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
       "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect"."2.14.5" =
     self.by-version."connect"."2.14.5";
   by-version."connect"."2.14.5" = self.buildNodePackage {
     name = "connect-2.14.5";
+    version = "2.14.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
@@ -5972,145 +7846,65 @@
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."connect"."2.28.3" =
-    self.by-version."connect"."2.28.3";
-  by-version."connect"."2.28.3" = self.buildNodePackage {
-    name = "connect-2.28.3";
+  by-spec."connect"."2.26.1" =
+    self.by-version."connect"."2.26.1";
+  by-version."connect"."2.26.1" = self.buildNodePackage {
+    name = "connect-2.26.1";
+    version = "2.26.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.28.3.tgz";
-      name = "connect-2.28.3.tgz";
-      sha1 = "60df681ca6a940675d89546f0df84e299cdc13d1";
+      url = "http://registry.npmjs.org/connect/-/connect-2.26.1.tgz";
+      name = "connect-2.26.1.tgz";
+      sha1 = "e8eb8c182c5120d25f5a5b76a09e7b99694d1403";
     };
     deps = {
       "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2";
+      "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "compression-1.3.1" = self.by-version."compression"."1.3.1";
-      "connect-timeout-1.5.0" = self.by-version."connect-timeout"."1.5.0";
+      "compression-1.1.2" = self.by-version."compression"."1.1.2";
+      "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0";
       "csurf-1.6.6" = self.by-version."csurf"."1.6.6";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4";
-      "express-session-1.10.3" = self.by-version."express-session"."1.10.3";
-      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "depd-0.4.5" = self.by-version."depd"."0.4.5";
+      "errorhandler-1.2.4" = self.by-version."errorhandler"."1.2.4";
+      "express-session-1.8.2" = self.by-version."express-session"."1.8.2";
+      "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "method-override-2.3.1" = self.by-version."method-override"."2.3.1";
-      "morgan-1.5.1" = self.by-version."morgan"."1.5.1";
+      "method-override-2.2.0" = self.by-version."method-override"."2.2.0";
+      "morgan-1.3.2" = self.by-version."morgan"."1.3.2";
       "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "response-time-2.2.0" = self.by-version."response-time"."2.2.0";
-      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2";
-      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
+      "qs-2.2.3" = self.by-version."qs"."2.2.3";
+      "response-time-2.0.1" = self.by-version."response-time"."2.0.1";
+      "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7";
+      "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1";
+      "serve-static-1.6.5" = self.by-version."serve-static"."1.6.5";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
-    peerDependencies = [];
-  };
-  by-spec."connect"."2.3.x" =
-    self.by-version."connect"."2.3.9";
-  by-version."connect"."2.3.9" = self.buildNodePackage {
-    name = "connect-2.3.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
-      name = "connect-2.3.9.tgz";
-      sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
-    };
-    deps = {
-      "qs-0.4.2" = self.by-version."qs"."0.4.2";
-      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
-      "crc-0.2.0" = self.by-version."crc"."0.2.0";
-      "cookie-0.0.4" = self.by-version."cookie"."0.0.4";
-      "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
-      "send-0.0.3" = self.by-version."send"."0.0.3";
-      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."connect"."2.7.5" =
-    self.by-version."connect"."2.7.5";
-  by-version."connect"."2.7.5" = self.buildNodePackage {
-    name = "connect-2.7.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
-      name = "connect-2.7.5.tgz";
-      sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
-    };
-    deps = {
-      "qs-0.5.1" = self.by-version."qs"."0.5.1";
-      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
-      "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
-      "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
-      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
-      "send-0.1.0" = self.by-version."send"."0.1.0";
-      "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
-      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-    };
-    peerDependencies = [];
-  };
-  by-spec."connect"."2.7.6" =
-    self.by-version."connect"."2.7.6";
-  by-version."connect"."2.7.6" = self.buildNodePackage {
-    name = "connect-2.7.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
-      name = "connect-2.7.6.tgz";
-      sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
-    };
-    deps = {
-      "qs-0.5.1" = self.by-version."qs"."0.5.1";
-      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
-      "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
-      "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
-      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
-      "send-0.1.0" = self.by-version."send"."0.1.0";
-      "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
-      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-    };
-    peerDependencies = [];
-  };
-  by-spec."connect"."3.0.2" =
-    self.by-version."connect"."3.0.2";
-  by-version."connect"."3.0.2" = self.buildNodePackage {
-    name = "connect-3.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-3.0.2.tgz";
-      name = "connect-3.0.2.tgz";
-      sha1 = "1f90b4672fe009fa2876df860442d30db18609a2";
-    };
-    deps = {
-      "debug-1.0.3" = self.by-version."debug"."1.0.3";
-      "finalhandler-0.0.2" = self.by-version."finalhandler"."0.0.2";
-      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    peerDependencies = [];
-  };
-  by-spec."connect"."^2.14.5" =
+  by-spec."connect"."2.29.0" =
     self.by-version."connect"."2.29.0";
   by-version."connect"."2.29.0" = self.buildNodePackage {
     name = "connect-2.29.0";
+    version = "2.29.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect/-/connect-2.29.0.tgz";
@@ -6150,14 +7944,129 @@
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."connect"."2.3.x" =
+    self.by-version."connect"."2.3.9";
+  by-version."connect"."2.3.9" = self.buildNodePackage {
+    name = "connect-2.3.9";
+    version = "2.3.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
+      name = "connect-2.3.9.tgz";
+      sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
+    };
+    deps = {
+      "qs-0.4.2" = self.by-version."qs"."0.4.2";
+      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+      "crc-0.2.0" = self.by-version."crc"."0.2.0";
+      "cookie-0.0.4" = self.by-version."cookie"."0.0.4";
+      "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
+      "send-0.0.3" = self.by-version."send"."0.0.3";
+      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connect"."2.7.5" =
+    self.by-version."connect"."2.7.5";
+  by-version."connect"."2.7.5" = self.buildNodePackage {
+    name = "connect-2.7.5";
+    version = "2.7.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
+      name = "connect-2.7.5.tgz";
+      sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
+    };
+    deps = {
+      "qs-0.5.1" = self.by-version."qs"."0.5.1";
+      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+      "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
+      "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
+      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+      "send-0.1.0" = self.by-version."send"."0.1.0";
+      "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
+      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+      "pause-0.0.1" = self.by-version."pause"."0.0.1";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connect"."2.7.6" =
+    self.by-version."connect"."2.7.6";
+  by-version."connect"."2.7.6" = self.buildNodePackage {
+    name = "connect-2.7.6";
+    version = "2.7.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+      name = "connect-2.7.6.tgz";
+      sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
+    };
+    deps = {
+      "qs-0.5.1" = self.by-version."qs"."0.5.1";
+      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
+      "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
+      "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
+      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
+      "send-0.1.0" = self.by-version."send"."0.1.0";
+      "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
+      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
+      "pause-0.0.1" = self.by-version."pause"."0.0.1";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connect"."3.0.2" =
+    self.by-version."connect"."3.0.2";
+  by-version."connect"."3.0.2" = self.buildNodePackage {
+    name = "connect-3.0.2";
+    version = "3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-3.0.2.tgz";
+      name = "connect-3.0.2.tgz";
+      sha1 = "1f90b4672fe009fa2876df860442d30db18609a2";
+    };
+    deps = {
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "finalhandler-0.0.2" = self.by-version."finalhandler"."0.0.2";
+      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connect"."^2.14.5" =
+    self.by-version."connect"."2.29.0";
   by-spec."connect"."~2" =
     self.by-version."connect"."2.29.0";
   by-spec."connect"."~2.26.0" =
     self.by-version."connect"."2.26.6";
   by-version."connect"."2.26.6" = self.buildNodePackage {
     name = "connect-2.26.6";
+    version = "2.26.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz";
@@ -6195,12 +8104,17 @@
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-flash"."*" =
     self.by-version."connect-flash"."0.1.1";
   by-version."connect-flash"."0.1.1" = self.buildNodePackage {
     name = "connect-flash-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
@@ -6209,13 +8123,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "connect-flash" = self.by-version."connect-flash"."0.1.1";
   by-spec."connect-flash"."0.1.0" =
     self.by-version."connect-flash"."0.1.0";
   by-version."connect-flash"."0.1.0" = self.buildNodePackage {
     name = "connect-flash-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
@@ -6224,12 +8143,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-jade-static"."*" =
     self.by-version."connect-jade-static"."0.2.1";
   by-version."connect-jade-static"."0.2.1" = self.buildNodePackage {
     name = "connect-jade-static-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.1.tgz";
@@ -6239,13 +8163,18 @@
     deps = {
       "jade-1.9.2" = self.by-version."jade"."1.9.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.2.1";
   by-spec."connect-mongo"."*" =
     self.by-version."connect-mongo"."0.7.0";
   by-version."connect-mongo"."0.7.0" = self.buildNodePackage {
     name = "connect-mongo-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.7.0.tgz";
@@ -6255,10 +8184,14 @@
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
       "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "connect-mongo" = self.by-version."connect-mongo"."0.7.0";
   by-spec."connect-mongo".">=0.4.0" =
@@ -6267,6 +8200,7 @@
     self.by-version."connect-multiparty"."1.2.5";
   by-version."connect-multiparty"."1.2.5" = self.buildNodePackage {
     name = "connect-multiparty-1.2.5";
+    version = "1.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz";
@@ -6279,12 +8213,17 @@
       "qs-2.2.5" = self.by-version."qs"."2.2.5";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-restreamer"."*" =
     self.by-version."connect-restreamer"."1.0.1";
   by-version."connect-restreamer"."1.0.1" = self.buildNodePackage {
     name = "connect-restreamer-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.1.tgz";
@@ -6293,12 +8232,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-timeout"."1.0.0" =
     self.by-version."connect-timeout"."1.0.0";
   by-version."connect-timeout"."1.0.0" = self.buildNodePackage {
     name = "connect-timeout-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
@@ -6308,12 +8252,17 @@
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-timeout"."~1.3.0" =
     self.by-version."connect-timeout"."1.3.0";
   by-version."connect-timeout"."1.3.0" = self.buildNodePackage {
     name = "connect-timeout-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz";
@@ -6325,30 +8274,17 @@
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."connect-timeout"."~1.5.0" =
-    self.by-version."connect-timeout"."1.5.0";
-  by-version."connect-timeout"."1.5.0" = self.buildNodePackage {
-    name = "connect-timeout-1.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.5.0.tgz";
-      name = "connect-timeout-1.5.0.tgz";
-      sha1 = "f9a18b06d5074d06d6f7db0cdf0ebd4bd6467621";
-    };
-    deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connect-timeout"."~1.6.0" =
     self.by-version."connect-timeout"."1.6.0";
   by-version."connect-timeout"."1.6.0" = self.buildNodePackage {
     name = "connect-timeout-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.0.tgz";
@@ -6361,12 +8297,17 @@
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."connection-parse"."0.0.x" =
     self.by-version."connection-parse"."0.0.7";
   by-version."connection-parse"."0.0.7" = self.buildNodePackage {
     name = "connection-parse-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
@@ -6375,12 +8316,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."console-browserify"."1.1.x" =
     self.by-version."console-browserify"."1.1.0";
   by-version."console-browserify"."1.1.0" = self.buildNodePackage {
     name = "console-browserify-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
@@ -6390,7 +8336,11 @@
     deps = {
       "date-now-0.1.4" = self.by-version."date-now"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."console-browserify"."^1.1.0" =
     self.by-version."console-browserify"."1.1.0";
@@ -6398,6 +8348,7 @@
     self.by-version."console-browserify"."1.0.3";
   by-version."console-browserify"."1.0.3" = self.buildNodePackage {
     name = "console-browserify-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
@@ -6406,12 +8357,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = self.buildNodePackage {
     name = "constantinople-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
@@ -6421,7 +8377,11 @@
     deps = {
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."constantinople"."~1.0.2" =
     self.by-version."constantinople"."1.0.2";
@@ -6429,6 +8389,7 @@
     self.by-version."constantinople"."3.0.1";
   by-version."constantinople"."3.0.1" = self.buildNodePackage {
     name = "constantinople-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz";
@@ -6438,12 +8399,17 @@
     deps = {
       "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."constants-browserify"."~0.0.1" =
+  by-spec."constants-browserify"."0.0.1" =
     self.by-version."constants-browserify"."0.0.1";
   by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
     name = "constants-browserify-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
@@ -6452,12 +8418,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."constants-browserify"."~0.0.1" =
+    self.by-version."constants-browserify"."0.0.1";
   by-spec."content-disposition"."0.5.0" =
     self.by-version."content-disposition"."0.5.0";
   by-version."content-disposition"."0.5.0" = self.buildNodePackage {
     name = "content-disposition-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
@@ -6466,12 +8439,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."content-type"."~1.0.1" =
     self.by-version."content-type"."1.0.1";
   by-version."content-type"."1.0.1" = self.buildNodePackage {
     name = "content-type-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
@@ -6480,12 +8458,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."contextify"."~0.1.5" =
     self.by-version."contextify"."0.1.13";
   by-version."contextify"."0.1.13" = self.buildNodePackage {
     name = "contextify-0.1.13";
+    version = "0.1.13";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/contextify/-/contextify-0.1.13.tgz";
@@ -6496,12 +8479,17 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.5.3" = self.by-version."nan"."1.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."convert-source-map"."~0.3.0" =
     self.by-version."convert-source-map"."0.3.5";
   by-version."convert-source-map"."0.3.5" = self.buildNodePackage {
     name = "convert-source-map-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
@@ -6510,12 +8498,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie"."0.0.4" =
     self.by-version."cookie"."0.0.4";
   by-version."cookie"."0.0.4" = self.buildNodePackage {
     name = "cookie-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
@@ -6524,12 +8517,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie"."0.0.5" =
     self.by-version."cookie"."0.0.5";
   by-version."cookie"."0.0.5" = self.buildNodePackage {
     name = "cookie-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
@@ -6538,12 +8536,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie"."0.1.0" =
     self.by-version."cookie"."0.1.0";
   by-version."cookie"."0.1.0" = self.buildNodePackage {
     name = "cookie-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
@@ -6552,12 +8555,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie"."0.1.2" =
     self.by-version."cookie"."0.1.2";
   by-version."cookie"."0.1.2" = self.buildNodePackage {
     name = "cookie-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
@@ -6566,12 +8574,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-jar"."~0.2.0" =
     self.by-version."cookie-jar"."0.2.0";
   by-version."cookie-jar"."0.2.0" = self.buildNodePackage {
     name = "cookie-jar-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
@@ -6580,12 +8593,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-jar"."~0.3.0" =
     self.by-version."cookie-jar"."0.3.0";
   by-version."cookie-jar"."0.3.0" = self.buildNodePackage {
     name = "cookie-jar-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
@@ -6594,12 +8612,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-parser"."1.0.1" =
     self.by-version."cookie-parser"."1.0.1";
   by-version."cookie-parser"."1.0.1" = self.buildNodePackage {
     name = "cookie-parser-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
@@ -6610,12 +8633,17 @@
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
       "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-parser"."^1.0.1" =
     self.by-version."cookie-parser"."1.3.4";
   by-version."cookie-parser"."1.3.4" = self.buildNodePackage {
     name = "cookie-parser-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz";
@@ -6626,7 +8654,11 @@
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-parser"."~1.3.3" =
     self.by-version."cookie-parser"."1.3.4";
@@ -6636,6 +8668,7 @@
     self.by-version."cookie-signature"."1.0.0";
   by-version."cookie-signature"."1.0.0" = self.buildNodePackage {
     name = "cookie-signature-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
@@ -6644,12 +8677,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-signature"."1.0.1" =
     self.by-version."cookie-signature"."1.0.1";
   by-version."cookie-signature"."1.0.1" = self.buildNodePackage {
     name = "cookie-signature-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
@@ -6658,12 +8696,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-signature"."1.0.3" =
     self.by-version."cookie-signature"."1.0.3";
   by-version."cookie-signature"."1.0.3" = self.buildNodePackage {
     name = "cookie-signature-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
@@ -6672,12 +8715,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-signature"."1.0.4" =
     self.by-version."cookie-signature"."1.0.4";
   by-version."cookie-signature"."1.0.4" = self.buildNodePackage {
     name = "cookie-signature-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
@@ -6686,12 +8734,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-signature"."1.0.5" =
     self.by-version."cookie-signature"."1.0.5";
   by-version."cookie-signature"."1.0.5" = self.buildNodePackage {
     name = "cookie-signature-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
@@ -6700,12 +8753,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookie-signature"."1.0.6" =
     self.by-version."cookie-signature"."1.0.6";
   by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
     name = "cookie-signature-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
@@ -6714,12 +8772,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookiejar"."2.0.1" =
     self.by-version."cookiejar"."2.0.1";
   by-version."cookiejar"."2.0.1" = self.buildNodePackage {
     name = "cookiejar-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
@@ -6728,12 +8791,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookies"."0.1.x" =
     self.by-version."cookies"."0.1.6";
   by-version."cookies"."0.1.6" = self.buildNodePackage {
     name = "cookies-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookies/-/cookies-0.1.6.tgz";
@@ -6742,12 +8810,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cookies".">= 0.2.2" =
     self.by-version."cookies"."0.5.0";
   by-version."cookies"."0.5.0" = self.buildNodePackage {
     name = "cookies-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
@@ -6757,12 +8830,17 @@
     deps = {
       "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cordova"."*" =
     self.by-version."cordova"."4.2.0";
   by-version."cordova"."4.2.0" = self.buildNodePackage {
     name = "cordova-4.2.0";
+    version = "4.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/cordova/-/cordova-4.2.0.tgz";
@@ -6775,13 +8853,18 @@
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "cordova" = self.by-version."cordova"."4.2.0";
   by-spec."cordova-js"."3.7.3" =
     self.by-version."cordova-js"."3.7.3";
   by-version."cordova-js"."3.7.3" = self.buildNodePackage {
     name = "cordova-js-3.7.3";
+    version = "3.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.3.tgz";
@@ -6793,12 +8876,17 @@
       "through-2.3.4" = self.by-version."through"."2.3.4";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cordova-lib"."4.2.0" =
     self.by-version."cordova-lib"."4.2.0";
   by-version."cordova-lib"."4.2.0" = self.buildNodePackage {
     name = "cordova-lib-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.2.0.tgz";
@@ -6830,12 +8918,17 @@
       "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1";
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."core-util-is"."~1.0.0" =
     self.by-version."core-util-is"."1.0.1";
   by-version."core-util-is"."1.0.1" = self.buildNodePackage {
     name = "core-util-is-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
@@ -6844,12 +8937,37 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cors"."2.5.3" =
+    self.by-version."cors"."2.5.3";
+  by-version."cors"."2.5.3" = self.buildNodePackage {
+    name = "cors-2.5.3";
+    version = "2.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cors/-/cors-2.5.3.tgz";
+      name = "cors-2.5.3.tgz";
+      sha1 = "0d70a211ec3b6cc9824e6cdc299c0630ef69c392";
+    };
+    deps = {
+      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."couch-login"."~0.1.15" =
     self.by-version."couch-login"."0.1.20";
   by-version."couch-login"."0.1.20" = self.buildNodePackage {
     name = "couch-login-0.1.20";
+    version = "0.1.20";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
@@ -6859,12 +8977,17 @@
     deps = {
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."coveralls"."*" =
     self.by-version."coveralls"."2.11.2";
   by-version."coveralls"."2.11.2" = self.buildNodePackage {
     name = "coveralls-2.11.2";
+    version = "2.11.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
@@ -6877,13 +9000,18 @@
       "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4";
       "request-2.40.0" = self.by-version."request"."2.40.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "coveralls" = self.by-version."coveralls"."2.11.2";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = self.buildNodePackage {
     name = "crc-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
@@ -6892,12 +9020,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crc"."3.0.0" =
     self.by-version."crc"."3.0.0";
   by-version."crc"."3.0.0" = self.buildNodePackage {
     name = "crc-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
@@ -6906,12 +9039,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crc"."3.2.1" =
     self.by-version."crc"."3.2.1";
   by-version."crc"."3.2.1" = self.buildNodePackage {
     name = "crc-3.2.1";
+    version = "3.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
@@ -6920,12 +9058,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crc32-stream"."~0.3.1" =
     self.by-version."crc32-stream"."0.3.2";
   by-version."crc32-stream"."0.3.2" = self.buildNodePackage {
     name = "crc32-stream-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.2.tgz";
@@ -6936,12 +9079,17 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."create-ecdh"."1.0.3" =
     self.by-version."create-ecdh"."1.0.3";
   by-version."create-ecdh"."1.0.3" = self.buildNodePackage {
     name = "create-ecdh-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.3.tgz";
@@ -6952,12 +9100,17 @@
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
       "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."create-hash"."^1.1.0" =
     self.by-version."create-hash"."1.1.0";
   by-version."create-hash"."1.1.0" = self.buildNodePackage {
     name = "create-hash-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.0.tgz";
@@ -6969,12 +9122,17 @@
       "ripemd160-1.0.0" = self.by-version."ripemd160"."1.0.0";
       "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."create-hmac"."^1.1.0" =
     self.by-version."create-hmac"."1.1.3";
   by-version."create-hmac"."1.1.3" = self.buildNodePackage {
     name = "create-hmac-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz";
@@ -6985,14 +9143,19 @@
       "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."create-hmac"."^1.1.2" =
     self.by-version."create-hmac"."1.1.3";
-  by-spec."cron".">=1.0.1" =
+  by-spec."cron"."1.0.6" =
     self.by-version."cron"."1.0.6";
   by-version."cron"."1.0.6" = self.buildNodePackage {
     name = "cron-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cron/-/cron-1.0.6.tgz";
@@ -7002,14 +9165,21 @@
     deps = {
       "moment-timezone-0.2.4" = self.by-version."moment-timezone"."0.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."cron".">=1.0.1" =
+    self.by-version."cron"."1.0.6";
   by-spec."cron"."^1.0.4" =
     self.by-version."cron"."1.0.6";
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
   by-version."crossroads"."0.12.0" = self.buildNodePackage {
     name = "crossroads-0.12.0";
+    version = "0.12.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
@@ -7019,12 +9189,17 @@
     deps = {
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cryptiles"."0.1.x" =
     self.by-version."cryptiles"."0.1.3";
   by-version."cryptiles"."0.1.3" = self.buildNodePackage {
     name = "cryptiles-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
@@ -7034,12 +9209,17 @@
     deps = {
       "boom-0.3.8" = self.by-version."boom"."0.3.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cryptiles"."0.2.x" =
     self.by-version."cryptiles"."0.2.2";
   by-version."cryptiles"."0.2.2" = self.buildNodePackage {
     name = "cryptiles-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
@@ -7049,12 +9229,17 @@
     deps = {
       "boom-0.4.2" = self.by-version."boom"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cryptiles"."2.x.x" =
     self.by-version."cryptiles"."2.0.4";
   by-version."cryptiles"."2.0.4" = self.buildNodePackage {
     name = "cryptiles-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
@@ -7064,12 +9249,17 @@
     deps = {
       "boom-2.6.1" = self.by-version."boom"."2.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crypto"."0.0.3" =
     self.by-version."crypto"."0.0.3";
   by-version."crypto"."0.0.3" = self.buildNodePackage {
     name = "crypto-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
@@ -7078,12 +9268,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."crypto-browserify"."3.3.0" =
+    self.by-version."crypto-browserify"."3.3.0";
+  by-version."crypto-browserify"."3.3.0" = self.buildNodePackage {
+    name = "crypto-browserify-3.3.0";
+    version = "3.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+      name = "crypto-browserify-3.3.0.tgz";
+      sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
+    };
+    deps = {
+      "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
+      "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
+      "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6";
+      "browserify-aes-0.4.0" = self.by-version."browserify-aes"."0.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crypto-browserify"."^3.0.0" =
     self.by-version."crypto-browserify"."3.9.12";
   by-version."crypto-browserify"."3.9.12" = self.buildNodePackage {
     name = "crypto-browserify-3.9.12";
+    version = "3.9.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.12.tgz";
@@ -7102,7 +9320,11 @@
       "public-encrypt-1.1.2" = self.by-version."public-encrypt"."1.1.2";
       "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."crypto-browserify"."^3.2.6" =
     self.by-version."crypto-browserify"."3.9.12";
@@ -7110,6 +9332,7 @@
     self.by-version."crypto-browserify"."1.0.9";
   by-version."crypto-browserify"."1.0.9" = self.buildNodePackage {
     name = "crypto-browserify-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
@@ -7118,12 +9341,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."csrf"."~2.0.5" =
     self.by-version."csrf"."2.0.6";
   by-version."csrf"."2.0.6" = self.buildNodePackage {
     name = "csrf-2.0.6";
+    version = "2.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz";
@@ -7136,7 +9364,11 @@
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
       "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."csrf"."~2.0.6" =
     self.by-version."csrf"."2.0.6";
@@ -7144,6 +9376,7 @@
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = self.buildNodePackage {
     name = "css-1.0.8";
+    version = "1.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
@@ -7154,12 +9387,17 @@
       "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4";
       "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."css-parse"."1.0.4" =
     self.by-version."css-parse"."1.0.4";
   by-version."css-parse"."1.0.4" = self.buildNodePackage {
     name = "css-parse-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
@@ -7168,12 +9406,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."css-parse"."1.7.x" =
     self.by-version."css-parse"."1.7.0";
   by-version."css-parse"."1.7.0" = self.buildNodePackage {
     name = "css-parse-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
@@ -7182,12 +9425,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."css-stringify"."1.0.5" =
     self.by-version."css-stringify"."1.0.5";
   by-version."css-stringify"."1.0.5" = self.buildNodePackage {
     name = "css-stringify-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
@@ -7196,12 +9444,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cssom"."0.3.x" =
     self.by-version."cssom"."0.3.0";
   by-version."cssom"."0.3.0" = self.buildNodePackage {
     name = "cssom-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cssom/-/cssom-0.3.0.tgz";
@@ -7210,7 +9463,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cssom"."~0.3.0" =
     self.by-version."cssom"."0.3.0";
@@ -7218,6 +9475,7 @@
     self.by-version."cssstyle"."0.2.22";
   by-version."cssstyle"."0.2.22" = self.buildNodePackage {
     name = "cssstyle-0.2.22";
+    version = "0.2.22";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.22.tgz";
@@ -7227,12 +9485,17 @@
     deps = {
       "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."csurf"."1.1.0" =
     self.by-version."csurf"."1.1.0";
   by-version."csurf"."1.1.0" = self.buildNodePackage {
     name = "csurf-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
@@ -7243,12 +9506,17 @@
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
       "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."csurf"."~1.6.2" =
+  by-spec."csurf"."~1.6.1" =
     self.by-version."csurf"."1.6.6";
   by-version."csurf"."1.6.6" = self.buildNodePackage {
     name = "csurf-1.6.6";
+    version = "1.6.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz";
@@ -7261,14 +9529,19 @@
       "csrf-2.0.6" = self.by-version."csrf"."2.0.6";
       "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."csurf"."~1.6.6" =
+  by-spec."csurf"."~1.6.2" =
     self.by-version."csurf"."1.6.6";
   by-spec."csurf"."~1.7.0" =
     self.by-version."csurf"."1.7.0";
   by-version."csurf"."1.7.0" = self.buildNodePackage {
     name = "csurf-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz";
@@ -7281,12 +9554,17 @@
       "csrf-2.0.6" = self.by-version."csrf"."2.0.6";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
   by-version."ctype"."0.5.0" = self.buildNodePackage {
     name = "ctype-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
@@ -7295,12 +9573,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ctype"."0.5.2" =
     self.by-version."ctype"."0.5.2";
   by-version."ctype"."0.5.2" = self.buildNodePackage {
     name = "ctype-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
@@ -7309,12 +9592,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ctype"."0.5.3" =
     self.by-version."ctype"."0.5.3";
   by-version."ctype"."0.5.3" = self.buildNodePackage {
     name = "ctype-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
@@ -7323,12 +9611,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cycle"."1.0.x" =
     self.by-version."cycle"."1.0.3";
   by-version."cycle"."1.0.3" = self.buildNodePackage {
     name = "cycle-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
@@ -7337,12 +9630,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."d"."~0.1.1" =
     self.by-version."d"."0.1.1";
   by-version."d"."0.1.1" = self.buildNodePackage {
     name = "d-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz";
@@ -7352,12 +9650,17 @@
     deps = {
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."d8"."0.4.4" =
     self.by-version."d8"."0.4.4";
   by-version."d8"."0.4.4" = self.buildNodePackage {
     name = "d8-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz";
@@ -7367,12 +9670,17 @@
     deps = {
       "m8-0.4.4" = self.by-version."m8"."0.4.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dashdash"."1.3.2" =
     self.by-version."dashdash"."1.3.2";
   by-version."dashdash"."1.3.2" = self.buildNodePackage {
     name = "dashdash-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
@@ -7382,12 +9690,17 @@
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dashdash"."1.5.0" =
     self.by-version."dashdash"."1.5.0";
   by-version."dashdash"."1.5.0" = self.buildNodePackage {
     name = "dashdash-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
@@ -7397,12 +9710,17 @@
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."data-uri-to-buffer"."0" =
     self.by-version."data-uri-to-buffer"."0.0.3";
   by-version."data-uri-to-buffer"."0.0.3" = self.buildNodePackage {
     name = "data-uri-to-buffer-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz";
@@ -7411,12 +9729,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."date-now"."^0.1.4" =
     self.by-version."date-now"."0.1.4";
   by-version."date-now"."0.1.4" = self.buildNodePackage {
     name = "date-now-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
@@ -7425,12 +9748,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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" = self.buildNodePackage {
     name = "dateformat-1.0.2-1.2.3";
+    version = "1.0.2-1.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
@@ -7439,12 +9767,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dateformat"."1.0.7-1.2.3" =
     self.by-version."dateformat"."1.0.7-1.2.3";
   by-version."dateformat"."1.0.7-1.2.3" = self.buildNodePackage {
     name = "dateformat-1.0.7-1.2.3";
+    version = "1.0.7-1.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
@@ -7453,12 +9786,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dateformat"."^1.0.11" =
     self.by-version."dateformat"."1.0.11";
   by-version."dateformat"."1.0.11" = self.buildNodePackage {
     name = "dateformat-1.0.11";
+    version = "1.0.11";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz";
@@ -7469,28 +9807,39 @@
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
       "meow-3.0.0" = self.by-version."meow"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dateformat"."~1.0.6" =
     self.by-version."dateformat"."1.0.11";
   by-spec."datejs".">=0.0.2" =
-    self.by-version."datejs"."1.0.0-rc3";
-  by-version."datejs"."1.0.0-rc3" = self.buildNodePackage {
-    name = "datejs-1.0.0-rc3";
+    self.by-version."datejs"."0.0.2";
+  by-version."datejs"."0.0.2" = self.buildNodePackage {
+    name = "datejs-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/datejs/-/datejs-1.0.0-rc3.tgz";
-      name = "datejs-1.0.0-rc3.tgz";
-      sha1 = "bffa1efedefeb41fdd8a242af55afa01fb58de57";
+      url = "http://registry.npmjs.org/datejs/-/datejs-0.0.2.tgz";
+      name = "datejs-0.0.2.tgz";
+      sha1 = "242cf2e1c7338d9502a5ae4196fd69e234211f4a";
     };
     deps = {
+      "vows-0.8.1" = self.by-version."vows"."0.8.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debounced-seeker"."^1.0.0" =
     self.by-version."debounced-seeker"."1.0.0";
   by-version."debounced-seeker"."1.0.0" = self.buildNodePackage {
     name = "debounced-seeker-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz";
@@ -7499,12 +9848,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."*" =
     self.by-version."debug"."2.1.1";
   by-version."debug"."2.1.1" = self.buildNodePackage {
     name = "debug-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-2.1.1.tgz";
@@ -7514,12 +9868,17 @@
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."0" =
     self.by-version."debug"."0.8.1";
   by-version."debug"."0.8.1" = self.buildNodePackage {
     name = "debug-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
@@ -7528,12 +9887,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."0.5.0" =
     self.by-version."debug"."0.5.0";
   by-version."debug"."0.5.0" = self.buildNodePackage {
     name = "debug-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
@@ -7542,12 +9906,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."0.6.0" =
     self.by-version."debug"."0.6.0";
   by-version."debug"."0.6.0" = self.buildNodePackage {
     name = "debug-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
@@ -7556,12 +9925,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."0.7.4" =
     self.by-version."debug"."0.7.4";
   by-version."debug"."0.7.4" = self.buildNodePackage {
     name = "debug-0.7.4";
+    version = "0.7.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
@@ -7570,12 +9944,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."debug"."0.7.x" =
+    self.by-version."debug"."0.7.4";
   by-spec."debug"."0.8.0" =
     self.by-version."debug"."0.8.0";
   by-version."debug"."0.8.0" = self.buildNodePackage {
     name = "debug-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
@@ -7584,7 +9965,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."0.8.1" =
     self.by-version."debug"."0.8.1";
@@ -7592,6 +9977,7 @@
     self.by-version."debug"."1.0.2";
   by-version."debug"."1.0.2" = self.buildNodePackage {
     name = "debug-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
@@ -7601,12 +9987,17 @@
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."1.0.3" =
     self.by-version."debug"."1.0.3";
   by-version."debug"."1.0.3" = self.buildNodePackage {
     name = "debug-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
@@ -7616,7 +10007,11 @@
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."2" =
     self.by-version."debug"."2.1.1";
@@ -7624,6 +10019,7 @@
     self.by-version."debug"."2.0.0";
   by-version."debug"."2.0.0" = self.buildNodePackage {
     name = "debug-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
@@ -7633,7 +10029,11 @@
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug".">= 0.7.0" =
     self.by-version."debug"."2.1.1";
@@ -7645,6 +10045,7 @@
     self.by-version."debug"."1.0.4";
   by-version."debug"."1.0.4" = self.buildNodePackage {
     name = "debug-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
@@ -7654,7 +10055,11 @@
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."^1.0.0" =
     self.by-version."debug"."1.0.4";
@@ -7688,6 +10093,7 @@
     self.by-version."debuglog"."1.0.1";
   by-version."debuglog"."1.0.1" = self.buildNodePackage {
     name = "debuglog-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
@@ -7696,12 +10102,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."decompress-zip"."0.0.8" =
     self.by-version."decompress-zip"."0.0.8";
   by-version."decompress-zip"."0.0.8" = self.buildNodePackage {
     name = "decompress-zip-0.0.8";
+    version = "0.0.8";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
@@ -7717,12 +10128,17 @@
       "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = self.buildNodePackage {
     name = "deep-eql-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
@@ -7732,12 +10148,17 @@
     deps = {
       "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."*" =
     self.by-version."deep-equal"."1.0.0";
   by-version."deep-equal"."1.0.0" = self.buildNodePackage {
     name = "deep-equal-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz";
@@ -7746,12 +10167,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."0.0.0" =
     self.by-version."deep-equal"."0.0.0";
   by-version."deep-equal"."0.0.0" = self.buildNodePackage {
     name = "deep-equal-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
@@ -7760,14 +10186,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."deep-equal"."^1.0.0" =
+    self.by-version."deep-equal"."1.0.0";
   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" = self.buildNodePackage {
     name = "deep-equal-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
@@ -7776,12 +10209,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."~0.2.1" =
     self.by-version."deep-equal"."0.2.2";
   by-version."deep-equal"."0.2.2" = self.buildNodePackage {
     name = "deep-equal-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz";
@@ -7790,12 +10228,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.11";
   by-version."deep-extend"."0.2.11" = self.buildNodePackage {
     name = "deep-extend-0.2.11";
+    version = "0.2.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
@@ -7804,12 +10247,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-extend"."~0.3.2" =
     self.by-version."deep-extend"."0.3.2";
   by-version."deep-extend"."0.3.2" = self.buildNodePackage {
     name = "deep-extend-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz";
@@ -7818,12 +10266,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-is"."0.1.x" =
     self.by-version."deep-is"."0.1.3";
   by-version."deep-is"."0.1.3" = self.buildNodePackage {
     name = "deep-is-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
@@ -7832,7 +10285,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-is"."~0.1.2" =
     self.by-version."deep-is"."0.1.3";
@@ -7840,6 +10297,7 @@
     self.by-version."deepmerge"."0.2.7";
   by-version."deepmerge"."0.2.7" = self.buildNodePackage {
     name = "deepmerge-0.2.7";
+    version = "0.2.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
@@ -7848,13 +10306,39 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "deepmerge" = self.by-version."deepmerge"."0.2.7";
+  by-spec."default-browser-id"."1.0.2" =
+    self.by-version."default-browser-id"."1.0.2";
+  by-version."default-browser-id"."1.0.2" = self.buildNodePackage {
+    name = "default-browser-id-1.0.2";
+    version = "1.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.2.tgz";
+      name = "default-browser-id-1.0.2.tgz";
+      sha1 = "17f500f18e466d1a82c06cd7ccba71c6ee6600a9";
+    };
+    deps = {
+      "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
+      "untildify-1.0.0" = self.by-version."untildify"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ "darwin" ];
+    cpu = [ ];
+  };
   by-spec."defaultable"."~0.7.2" =
     self.by-version."defaultable"."0.7.2";
   by-version."defaultable"."0.7.2" = self.buildNodePackage {
     name = "defaultable-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/defaultable/-/defaultable-0.7.2.tgz";
@@ -7863,12 +10347,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."defaults"."^1.0.0" =
     self.by-version."defaults"."1.0.0";
   by-version."defaults"."1.0.0" = self.buildNodePackage {
     name = "defaults-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz";
@@ -7878,12 +10367,17 @@
     deps = {
       "clone-0.1.19" = self.by-version."clone"."0.1.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."defined"."0.0.0" =
     self.by-version."defined"."0.0.0";
   by-version."defined"."0.0.0" = self.buildNodePackage {
     name = "defined-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
@@ -7892,37 +10386,48 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."defined"."~0.0.0" =
     self.by-version."defined"."0.0.0";
-  by-spec."defs"."~0.6.2" =
-    self.by-version."defs"."0.6.2";
-  by-version."defs"."0.6.2" = self.buildNodePackage {
-    name = "defs-0.6.2";
+  by-spec."defs"."~1.1.0" =
+    self.by-version."defs"."1.1.0";
+  by-version."defs"."1.1.0" = self.buildNodePackage {
+    name = "defs-1.1.0";
+    version = "1.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defs/-/defs-0.6.2.tgz";
-      name = "defs-0.6.2.tgz";
-      sha1 = "c4e05855d29a7a3a9cd9cca4a40813503418d907";
+      url = "http://registry.npmjs.org/defs/-/defs-1.1.0.tgz";
+      name = "defs-1.1.0.tgz";
+      sha1 = "a271201acd271eb0be887eefc61edd9f89f32b49";
     };
     deps = {
       "alter-0.2.0" = self.by-version."alter"."0.2.0";
-      "breakable-0.1.0" = self.by-version."breakable"."0.1.0";
       "ast-traverse-0.1.1" = self.by-version."ast-traverse"."0.1.1";
+      "breakable-1.0.0" = self.by-version."breakable"."1.0.0";
+      "esprima-fb-8001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
       "simple-fmt-0.1.0" = self.by-version."simple-fmt"."0.1.0";
       "simple-is-0.2.0" = self.by-version."simple-is"."0.2.0";
       "stringmap-0.2.2" = self.by-version."stringmap"."0.2.2";
       "stringset-0.2.1" = self.by-version."stringset"."0.2.1";
       "tryor-0.1.2" = self.by-version."tryor"."0.1.2";
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."degenerator"."~1.0.0" =
     self.by-version."degenerator"."1.0.0";
   by-version."degenerator"."1.0.0" = self.buildNodePackage {
     name = "degenerator-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.0.tgz";
@@ -7934,12 +10439,17 @@
       "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
       "ast-types-0.3.38" = self.by-version."ast-types"."0.3.38";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
     name = "delayed-stream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
@@ -7948,12 +10458,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."delegates"."^0.1.0" =
     self.by-version."delegates"."0.1.0";
   by-version."delegates"."0.1.0" = self.buildNodePackage {
     name = "delegates-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz";
@@ -7962,12 +10477,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dep-graph"."1.1.0" =
     self.by-version."dep-graph"."1.1.0";
   by-version."dep-graph"."1.1.0" = self.buildNodePackage {
     name = "dep-graph-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz";
@@ -7977,12 +10497,17 @@
     deps = {
       "underscore-1.2.1" = self.by-version."underscore"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."depd"."0.3.0" =
     self.by-version."depd"."0.3.0";
   by-version."depd"."0.3.0" = self.buildNodePackage {
     name = "depd-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
@@ -7991,12 +10516,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."depd"."0.4.2" =
     self.by-version."depd"."0.4.2";
   by-version."depd"."0.4.2" = self.buildNodePackage {
     name = "depd-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/depd/-/depd-0.4.2.tgz";
@@ -8005,12 +10535,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."depd"."0.4.5" =
     self.by-version."depd"."0.4.5";
   by-version."depd"."0.4.5" = self.buildNodePackage {
     name = "depd-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
@@ -8019,12 +10554,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."depd".">= 0.4.0" =
     self.by-version."depd"."1.0.0";
   by-version."depd"."1.0.0" = self.buildNodePackage {
     name = "depd-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz";
@@ -8033,7 +10573,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."depd"."~1.0.0" =
     self.by-version."depd"."1.0.0";
@@ -8041,6 +10585,7 @@
     self.by-version."deprecated"."0.0.1";
   by-version."deprecated"."0.0.1" = self.buildNodePackage {
     name = "deprecated-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
@@ -8049,12 +10594,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deps-sort"."^1.3.5" =
     self.by-version."deps-sort"."1.3.5";
   by-version."deps-sort"."1.3.5" = self.buildNodePackage {
     name = "deps-sort-1.3.5";
+    version = "1.3.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
@@ -8068,12 +10618,17 @@
       "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deps-sort"."~0.1.1" =
     self.by-version."deps-sort"."0.1.2";
   by-version."deps-sort"."0.1.2" = self.buildNodePackage {
     name = "deps-sort-0.1.2";
+    version = "0.1.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
@@ -8085,12 +10640,17 @@
       "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."derequire"."~0.6.0" =
     self.by-version."derequire"."0.6.1";
   by-version."derequire"."0.6.1" = self.buildNodePackage {
     name = "derequire-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
@@ -8102,12 +10662,17 @@
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
       "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."destroy"."1.0.3" =
     self.by-version."destroy"."1.0.3";
   by-version."destroy"."1.0.3" = self.buildNodePackage {
     name = "destroy-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
@@ -8116,12 +10681,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."detective"."^4.0.0" =
     self.by-version."detective"."4.0.0";
   by-version."detective"."4.0.0" = self.buildNodePackage {
     name = "detective-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz";
@@ -8133,12 +10703,17 @@
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."detective"."~2.1.2" =
     self.by-version."detective"."2.1.2";
   by-version."detective"."2.1.2" = self.buildNodePackage {
     name = "detective-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz";
@@ -8149,12 +10724,17 @@
       "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
       "escodegen-0.0.15" = self.by-version."escodegen"."0.0.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dezalgo"."^1.0.0" =
     self.by-version."dezalgo"."1.0.1";
   by-version."dezalgo"."1.0.1" = self.buildNodePackage {
     name = "dezalgo-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz";
@@ -8165,7 +10745,11 @@
       "asap-1.0.0" = self.by-version."asap"."1.0.0";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dezalgo"."^1.0.1" =
     self.by-version."dezalgo"."1.0.1";
@@ -8175,6 +10759,7 @@
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = self.buildNodePackage {
     name = "di-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
@@ -8183,12 +10768,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dicer"."0.2.3" =
     self.by-version."dicer"."0.2.3";
   by-version."dicer"."0.2.3" = self.buildNodePackage {
     name = "dicer-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dicer/-/dicer-0.2.3.tgz";
@@ -8199,12 +10789,17 @@
       "streamsearch-0.1.2" = self.by-version."streamsearch"."0.1.2";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."diff"."1.0.7" =
     self.by-version."diff"."1.0.7";
   by-version."diff"."1.0.7" = self.buildNodePackage {
     name = "diff-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
@@ -8213,12 +10808,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."diff"."1.0.8" =
     self.by-version."diff"."1.0.8";
   by-version."diff"."1.0.8" = self.buildNodePackage {
     name = "diff-1.0.8";
+    version = "1.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
@@ -8227,28 +10827,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."diff"."~1.0.7" =
     self.by-version."diff"."1.0.8";
-  by-spec."diff"."~1.2.0" =
-    self.by-version."diff"."1.2.2";
-  by-version."diff"."1.2.2" = self.buildNodePackage {
-    name = "diff-1.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/diff/-/diff-1.2.2.tgz";
-      name = "diff-1.2.2.tgz";
-      sha1 = "27f936a1f5831581024e9ac78fbda7330ce79e85";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
+  by-spec."diff"."~1.0.8" =
+    self.by-version."diff"."1.0.8";
   by-spec."diffie-hellman"."^3.0.1" =
     self.by-version."diffie-hellman"."3.0.1";
   by-version."diffie-hellman"."3.0.1" = self.buildNodePackage {
     name = "diffie-hellman-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz";
@@ -8260,12 +10853,17 @@
       "miller-rabin-1.1.5" = self.by-version."miller-rabin"."1.1.5";
       "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."difflet"."~0.2.0" =
     self.by-version."difflet"."0.2.6";
   by-version."difflet"."0.2.6" = self.buildNodePackage {
     name = "difflet-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
@@ -8277,12 +10875,17 @@
       "charm-0.1.2" = self.by-version."charm"."0.1.2";
       "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."directmail"."~0.1.7" =
     self.by-version."directmail"."0.1.8";
   by-version."directmail"."0.1.8" = self.buildNodePackage {
     name = "directmail-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/directmail/-/directmail-0.1.8.tgz";
@@ -8292,12 +10895,17 @@
     deps = {
       "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."director"."1.2.7" =
     self.by-version."director"."1.2.7";
   by-version."director"."1.2.7" = self.buildNodePackage {
     name = "director-1.2.7";
+    version = "1.2.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz";
@@ -8306,12 +10914,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dkim-signer"."~0.1.1" =
     self.by-version."dkim-signer"."0.1.2";
   by-version."dkim-signer"."0.1.2" = self.buildNodePackage {
     name = "dkim-signer-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
@@ -8320,14 +10933,19 @@
     };
     deps = {
       "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
-      "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18";
+      "mimelib-0.2.19" = self.by-version."mimelib"."0.2.19";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dns"."^0.2.2" =
     self.by-version."dns"."0.2.2";
   by-version."dns"."0.2.2" = self.buildNodePackage {
     name = "dns-0.2.2";
+    version = "0.2.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/dns/-/dns-0.2.2.tgz";
@@ -8342,12 +10960,17 @@
       "tomahawk-0.1.6" = self.by-version."tomahawk"."0.1.6";
       "tomahawk-plugin-kv-memory-store-0.0.3" = self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dom-serializer"."0" =
     self.by-version."dom-serializer"."0.1.0";
   by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
     name = "dom-serializer-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
@@ -8358,12 +10981,17 @@
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dom-serializer"."~0.0.0" =
     self.by-version."dom-serializer"."0.0.1";
   by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
     name = "dom-serializer-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
@@ -8374,12 +11002,17 @@
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."domain-browser"."~1.1.0" =
+  by-spec."domain-browser"."^1.1.1" =
     self.by-version."domain-browser"."1.1.4";
   by-version."domain-browser"."1.1.4" = self.buildNodePackage {
     name = "domain-browser-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz";
@@ -8388,12 +11021,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."domain-browser"."~1.1.0" =
+    self.by-version."domain-browser"."1.1.4";
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.1.3";
   by-version."domelementtype"."1.1.3" = self.buildNodePackage {
     name = "domelementtype-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
@@ -8402,7 +11042,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domelementtype"."~1.1.1" =
     self.by-version."domelementtype"."1.1.3";
@@ -8410,6 +11054,7 @@
     self.by-version."domhandler"."2.2.1";
   by-version."domhandler"."2.2.1" = self.buildNodePackage {
     name = "domhandler-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz";
@@ -8419,12 +11064,17 @@
     deps = {
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domhandler"."2.3" =
     self.by-version."domhandler"."2.3.0";
   by-version."domhandler"."2.3.0" = self.buildNodePackage {
     name = "domhandler-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
@@ -8434,12 +11084,17 @@
     deps = {
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domino"."~1.0.18" =
     self.by-version."domino"."1.0.18";
   by-version."domino"."1.0.18" = self.buildNodePackage {
     name = "domino-1.0.18";
+    version = "1.0.18";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domino/-/domino-1.0.18.tgz";
@@ -8448,12 +11103,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domutils"."1.4" =
     self.by-version."domutils"."1.4.3";
   by-version."domutils"."1.4.3" = self.buildNodePackage {
     name = "domutils-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
@@ -8463,12 +11123,17 @@
     deps = {
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domutils"."1.5" =
     self.by-version."domutils"."1.5.1";
   by-version."domutils"."1.5.1" = self.buildNodePackage {
     name = "domutils-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
@@ -8479,28 +11144,17 @@
       "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
-    peerDependencies = [];
-  };
-  by-spec."dox"."~0.4.4" =
-    self.by-version."dox"."0.4.6";
-  by-version."dox"."0.4.6" = self.buildNodePackage {
-    name = "dox-0.4.6";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz";
-      name = "dox-0.4.6.tgz";
-      sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215";
-    };
-    deps = {
-      "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "commander-0.6.1" = self.by-version."commander"."0.6.1";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dropbox"."=0.9.2" =
     self.by-version."dropbox"."0.9.2";
   by-version."dropbox"."0.9.2" = self.buildNodePackage {
     name = "dropbox-0.9.2";
+    version = "0.9.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dropbox/-/dropbox-0.9.2.tgz";
@@ -8511,12 +11165,17 @@
       "open-0.0.5" = self.by-version."open"."0.0.5";
       "xhr2-0.1.2" = self.by-version."xhr2"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."dtrace-provider"."0.2.8" =
     self.by-version."dtrace-provider"."0.2.8";
   by-version."dtrace-provider"."0.2.8" = self.buildNodePackage {
     name = "dtrace-provider-0.2.8";
+    version = "0.2.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
@@ -8525,12 +11184,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."duplexer"."~0.1.1" =
+  by-spec."duplexer"."~0.1.0" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = self.buildNodePackage {
     name = "duplexer-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
@@ -8539,12 +11203,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."duplexer"."~0.1.1" =
+    self.by-version."duplexer"."0.1.1";
   by-spec."duplexer2"."0.0.2" =
     self.by-version."duplexer2"."0.0.2";
   by-version."duplexer2"."0.0.2" = self.buildNodePackage {
     name = "duplexer2-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
@@ -8554,7 +11225,11 @@
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."duplexer2"."~0.0.2" =
     self.by-version."duplexer2"."0.0.2";
@@ -8562,6 +11237,7 @@
     self.by-version."duplexify"."3.2.0";
   by-version."duplexify"."3.2.0" = self.buildNodePackage {
     name = "duplexify-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/duplexify/-/duplexify-3.2.0.tgz";
@@ -8572,12 +11248,17 @@
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."each-async"."^1.1.0" =
     self.by-version."each-async"."1.1.1";
   by-version."each-async"."1.1.1" = self.buildNodePackage {
     name = "each-async-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
@@ -8588,12 +11269,17 @@
       "onetime-1.0.0" = self.by-version."onetime"."1.0.0";
       "set-immediate-shim-1.0.0" = self.by-version."set-immediate-shim"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ecurve"."1.0.0" =
     self.by-version."ecurve"."1.0.0";
   by-version."ecurve"."1.0.0" = self.buildNodePackage {
     name = "ecurve-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ecurve/-/ecurve-1.0.0.tgz";
@@ -8603,12 +11289,17 @@
     deps = {
       "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."editor"."~0.1.0" =
     self.by-version."editor"."0.1.0";
   by-version."editor"."0.1.0" = self.buildNodePackage {
     name = "editor-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
@@ -8617,12 +11308,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ee-first"."1.0.3" =
     self.by-version."ee-first"."1.0.3";
   by-version."ee-first"."1.0.3" = self.buildNodePackage {
     name = "ee-first-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
@@ -8631,12 +11327,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ee-first"."1.0.5" =
     self.by-version."ee-first"."1.0.5";
   by-version."ee-first"."1.0.5" = self.buildNodePackage {
     name = "ee-first-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
@@ -8645,12 +11346,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ee-first"."1.1.0" =
     self.by-version."ee-first"."1.1.0";
   by-version."ee-first"."1.1.0" = self.buildNodePackage {
     name = "ee-first-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
@@ -8659,12 +11365,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ejs"."0.7.1" =
     self.by-version."ejs"."0.7.1";
   by-version."ejs"."0.7.1" = self.buildNodePackage {
     name = "ejs-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ejs/-/ejs-0.7.1.tgz";
@@ -8673,12 +11384,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
   by-version."ejs"."0.8.3" = self.buildNodePackage {
     name = "ejs-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
@@ -8687,26 +11403,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ejs".">=0.7.1" =
-    self.by-version."ejs"."2.2.4";
-  by-version."ejs"."2.2.4" = self.buildNodePackage {
-    name = "ejs-2.2.4";
+    self.by-version."ejs"."2.3.1";
+  by-version."ejs"."2.3.1" = self.buildNodePackage {
+    name = "ejs-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ejs/-/ejs-2.2.4.tgz";
-      name = "ejs-2.2.4.tgz";
-      sha1 = "f0af7e366c13149dd7ae30106c0c0e1cad11903c";
+      url = "http://registry.npmjs.org/ejs/-/ejs-2.3.1.tgz";
+      name = "ejs-2.3.1.tgz";
+      sha1 = "a697d98ac401e32a99c3deed92c60c19b6199a7f";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."elementtree"."0.1.5" =
     self.by-version."elementtree"."0.1.5";
   by-version."elementtree"."0.1.5" = self.buildNodePackage {
     name = "elementtree-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz";
@@ -8716,12 +11442,17 @@
     deps = {
       "sax-0.3.5" = self.by-version."sax"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."elliptic"."^1.0.0" =
     self.by-version."elliptic"."1.0.1";
   by-version."elliptic"."1.0.1" = self.buildNodePackage {
     name = "elliptic-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz";
@@ -8734,12 +11465,17 @@
       "hash.js-1.0.2" = self.by-version."hash.js"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."embedly".">=1.0.2" =
     self.by-version."embedly"."1.0.4";
   by-version."embedly"."1.0.4" = self.buildNodePackage {
     name = "embedly-1.0.4";
+    version = "1.0.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz";
@@ -8752,12 +11488,17 @@
       "sprintf-0.1.1" = self.by-version."sprintf"."0.1.1";
       "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."emitter"."http://github.com/component/emitter/archive/1.0.1.tar.gz" =
     self.by-version."emitter"."1.0.1";
   by-version."emitter"."1.0.1" = self.buildNodePackage {
     name = "emitter-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://github.com/component/emitter/archive/1.0.1.tar.gz";
@@ -8767,12 +11508,17 @@
     deps = {
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."empty-trash"."*" =
     self.by-version."empty-trash"."1.1.3";
   by-version."empty-trash"."1.1.3" = self.buildNodePackage {
     name = "empty-trash-1.1.3";
+    version = "1.1.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.3.tgz";
@@ -8785,13 +11531,18 @@
       "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
       "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "empty-trash" = self.by-version."empty-trash"."1.1.3";
   by-spec."encoding"."~0.1.7" =
     self.by-version."encoding"."0.1.11";
   by-version."encoding"."0.1.11" = self.buildNodePackage {
     name = "encoding-0.1.11";
+    version = "0.1.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz";
@@ -8801,12 +11552,17 @@
     deps = {
       "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."end-of-stream"."1.0.0" =
     self.by-version."end-of-stream"."1.0.0";
   by-version."end-of-stream"."1.0.0" = self.buildNodePackage {
     name = "end-of-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
@@ -8816,12 +11572,17 @@
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."end-of-stream"."^0.1.4" =
     self.by-version."end-of-stream"."0.1.5";
   by-version."end-of-stream"."0.1.5" = self.buildNodePackage {
     name = "end-of-stream-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
@@ -8831,12 +11592,17 @@
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."end-of-stream"."^1.0.0" =
     self.by-version."end-of-stream"."1.1.0";
   by-version."end-of-stream"."1.1.0" = self.buildNodePackage {
     name = "end-of-stream-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
@@ -8846,7 +11612,11 @@
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."end-of-stream"."~0.1.5" =
     self.by-version."end-of-stream"."0.1.5";
@@ -8856,6 +11626,7 @@
     self.by-version."engine.io"."1.3.1";
   by-version."engine.io"."1.3.1" = self.buildNodePackage {
     name = "engine.io-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz";
@@ -8868,12 +11639,17 @@
       "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."engine.io-client"."1.3.1" =
     self.by-version."engine.io-client"."1.3.1";
   by-version."engine.io-client"."1.3.1" = self.buildNodePackage {
     name = "engine.io-client-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz";
@@ -8893,12 +11669,17 @@
       "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
       "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."engine.io-parser"."1.0.6" =
     self.by-version."engine.io-parser"."1.0.6";
   by-version."engine.io-parser"."1.0.6" = self.buildNodePackage {
     name = "engine.io-parser-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz";
@@ -8912,12 +11693,39 @@
       "blob-0.0.2" = self.by-version."blob"."0.0.2";
       "utf8-2.0.0" = self.by-version."utf8"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."enhanced-resolve"."~0.8.2" =
+    self.by-version."enhanced-resolve"."0.8.4";
+  by-version."enhanced-resolve"."0.8.4" = self.buildNodePackage {
+    name = "enhanced-resolve-0.8.4";
+    version = "0.8.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.4.tgz";
+      name = "enhanced-resolve-0.8.4.tgz";
+      sha1 = "4dae8ed556e5312256a9dd317919478e904b5387";
+    };
+    deps = {
+      "tapable-0.1.8" = self.by-version."tapable"."0.1.8";
+      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
+      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."entities"."1.0" =
     self.by-version."entities"."1.0.0";
   by-version."entities"."1.0.0" = self.buildNodePackage {
     name = "entities-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
@@ -8926,12 +11734,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."entities"."~1.1.1" =
     self.by-version."entities"."1.1.1";
   by-version."entities"."1.1.1" = self.buildNodePackage {
     name = "entities-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
@@ -8940,12 +11753,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."envify"."^3.0.0" =
     self.by-version."envify"."3.2.0";
   by-version."envify"."3.2.0" = self.buildNodePackage {
     name = "envify-3.2.0";
+    version = "3.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz";
@@ -8956,12 +11774,17 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "jstransform-7.0.0" = self.by-version."jstransform"."7.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."errno"."^0.1.1" =
     self.by-version."errno"."0.1.1";
   by-version."errno"."0.1.1" = self.buildNodePackage {
     name = "errno-0.1.1";
+    version = "0.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/errno/-/errno-0.1.1.tgz";
@@ -8971,12 +11794,17 @@
     deps = {
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."errorhandler"."1.0.0" =
     self.by-version."errorhandler"."1.0.0";
   by-version."errorhandler"."1.0.0" = self.buildNodePackage {
     name = "errorhandler-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
@@ -8985,12 +11813,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."errorhandler"."1.1.1" =
     self.by-version."errorhandler"."1.1.1";
   by-version."errorhandler"."1.1.1" = self.buildNodePackage {
     name = "errorhandler-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
@@ -9001,12 +11834,17 @@
       "accepts-1.0.7" = self.by-version."accepts"."1.0.7";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."errorhandler"."^1.1.1" =
     self.by-version."errorhandler"."1.3.4";
   by-version."errorhandler"."1.3.4" = self.buildNodePackage {
     name = "errorhandler-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.4.tgz";
@@ -9017,12 +11855,17 @@
       "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."errorhandler"."~1.2.2" =
+  by-spec."errorhandler"."~1.2.0" =
     self.by-version."errorhandler"."1.2.4";
   by-version."errorhandler"."1.2.4" = self.buildNodePackage {
     name = "errorhandler-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz";
@@ -9033,16 +11876,21 @@
       "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."errorhandler"."~1.3.3" =
-    self.by-version."errorhandler"."1.3.4";
+  by-spec."errorhandler"."~1.2.2" =
+    self.by-version."errorhandler"."1.2.4";
   by-spec."errorhandler"."~1.3.4" =
     self.by-version."errorhandler"."1.3.4";
   by-spec."es5-ext"."~0.10.2" =
     self.by-version."es5-ext"."0.10.6";
   by-version."es5-ext"."0.10.6" = self.buildNodePackage {
     name = "es5-ext-0.10.6";
+    version = "0.10.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz";
@@ -9053,7 +11901,11 @@
       "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3";
       "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es5-ext"."~0.10.4" =
     self.by-version."es5-ext"."0.10.6";
@@ -9063,6 +11915,7 @@
     self.by-version."es6-iterator"."0.1.3";
   by-version."es6-iterator"."0.1.3" = self.buildNodePackage {
     name = "es6-iterator-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz";
@@ -9074,42 +11927,57 @@
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
       "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-iterator"."~0.1.3" =
     self.by-version."es6-iterator"."0.1.3";
-  by-spec."es6-promise"."^2.0.0" =
-    self.by-version."es6-promise"."2.0.1";
-  by-version."es6-promise"."2.0.1" = self.buildNodePackage {
-    name = "es6-promise-2.0.1";
+  by-spec."es6-promise"."^1.0.0" =
+    self.by-version."es6-promise"."1.0.0";
+  by-version."es6-promise"."1.0.0" = self.buildNodePackage {
+    name = "es6-promise-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.0.1.tgz";
-      name = "es6-promise-2.0.1.tgz";
-      sha1 = "ccc4963e679f0ca9fb187c777b9e583d3c7573c2";
+      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-1.0.0.tgz";
+      name = "es6-promise-1.0.0.tgz";
+      sha1 = "f90d3629faa7c26166ae4df77c89bacdeb8dca7f";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
-    self.by-version."es6-shim"."0.25.0";
-  by-version."es6-shim"."0.25.0" = self.buildNodePackage {
-    name = "es6-shim-0.25.0";
+    self.by-version."es6-shim"."0.25.3";
+  by-version."es6-shim"."0.25.3" = self.buildNodePackage {
+    name = "es6-shim-0.25.3";
+    version = "0.25.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.0.tgz";
-      name = "es6-shim-0.25.0.tgz";
-      sha1 = "62eea13af4aba9d3e4cb1c79e4b05556132a7a95";
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.3.tgz";
+      name = "es6-shim-0.25.3.tgz";
+      sha1 = "774d24aa33be5ba9404ba4de1086bf87a6302f66";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-shim"."~0.16.0" =
     self.by-version."es6-shim"."0.16.0";
   by-version."es6-shim"."0.16.0" = self.buildNodePackage {
     name = "es6-shim-0.16.0";
+    version = "0.16.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz";
@@ -9118,12 +11986,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-symbol"."0.1.x" =
     self.by-version."es6-symbol"."0.1.1";
   by-version."es6-symbol"."0.1.1" = self.buildNodePackage {
     name = "es6-symbol-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz";
@@ -9134,12 +12007,17 @@
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-symbol"."~2.0.1" =
     self.by-version."es6-symbol"."2.0.1";
   by-version."es6-symbol"."2.0.1" = self.buildNodePackage {
     name = "es6-symbol-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz";
@@ -9150,12 +12028,17 @@
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."es6-weak-map"."~0.1.2" =
     self.by-version."es6-weak-map"."0.1.2";
   by-version."es6-weak-map"."0.1.2" = self.buildNodePackage {
     name = "es6-weak-map-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz";
@@ -9168,12 +12051,17 @@
       "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3";
       "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escape-html"."*" =
     self.by-version."escape-html"."1.0.1";
   by-version."escape-html"."1.0.1" = self.buildNodePackage {
     name = "escape-html-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
@@ -9182,7 +12070,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
@@ -9191,6 +12083,7 @@
     self.by-version."escape-string-applescript"."1.0.0";
   by-version."escape-string-applescript"."1.0.0" = self.buildNodePackage {
     name = "escape-string-applescript-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz";
@@ -9199,12 +12092,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escape-string-regexp"."1.0.2" =
     self.by-version."escape-string-regexp"."1.0.2";
   by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage {
     name = "escape-string-regexp-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
@@ -9213,14 +12111,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escape-string-regexp"."^1.0.0" =
-    self.by-version."escape-string-regexp"."1.0.2";
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+      name = "escape-string-regexp-1.0.3.tgz";
+      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."escodegen"."0.0.15" =
     self.by-version."escodegen"."0.0.15";
   by-version."escodegen"."0.0.15" = self.buildNodePackage {
     name = "escodegen-0.0.15";
+    version = "0.0.15";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz";
@@ -9229,14 +12149,19 @@
     };
     deps = {
       "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
+    };
+    optionalDependencies = {
       "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escodegen"."0.0.17" =
     self.by-version."escodegen"."0.0.17";
   by-version."escodegen"."0.0.17" = self.buildNodePackage {
     name = "escodegen-0.0.17";
+    version = "0.0.17";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz";
@@ -9246,14 +12171,19 @@
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
       "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
+    };
+    optionalDependencies = {
       "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escodegen"."1.3.x" =
     self.by-version."escodegen"."1.3.3";
   by-version."escodegen"."1.3.3" = self.buildNodePackage {
     name = "escodegen-1.3.3";
+    version = "1.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
@@ -9264,14 +12194,19 @@
       "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
       "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
       "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
+    };
+    optionalDependencies = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escodegen"."^1.4.1" =
     self.by-version."escodegen"."1.6.1";
   by-version."escodegen"."1.6.1" = self.buildNodePackage {
     name = "escodegen-1.6.1";
+    version = "1.6.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz";
@@ -9283,9 +12218,13 @@
       "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
       "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
       "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
+    };
+    optionalDependencies = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escodegen"."~1.3.1" =
     self.by-version."escodegen"."1.3.3";
@@ -9293,6 +12232,7 @@
     self.by-version."escope"."0.0.16";
   by-version."escope"."0.0.16" = self.buildNodePackage {
     name = "escope-0.0.16";
+    version = "0.0.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
@@ -9302,12 +12242,17 @@
     deps = {
       "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esprima"."1.0.2" =
     self.by-version."esprima"."1.0.2";
   by-version."esprima"."1.0.2" = self.buildNodePackage {
     name = "esprima-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz";
@@ -9316,26 +12261,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."esprima"."1.2.2" =
-    self.by-version."esprima"."1.2.2";
-  by-version."esprima"."1.2.2" = self.buildNodePackage {
-    name = "esprima-1.2.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
-      name = "esprima-1.2.2.tgz";
-      sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esprima"."1.2.x" =
     self.by-version."esprima"."1.2.4";
   by-version."esprima"."1.2.4" = self.buildNodePackage {
     name = "esprima-1.2.4";
+    version = "1.2.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-1.2.4.tgz";
@@ -9344,12 +12280,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."esprima".">= 1.0.0" =
+  by-spec."esprima"."2.0.x" =
     self.by-version."esprima"."2.0.0";
   by-version."esprima"."2.0.0" = self.buildNodePackage {
     name = "esprima-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
@@ -9358,30 +12299,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."esprima".">= 1.0.0" =
+    self.by-version."esprima"."2.0.0";
   by-spec."esprima"."^1.2.2" =
     self.by-version."esprima"."1.2.4";
-  by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" =
+  by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" =
     self.by-version."esprima"."1.1.0-dev-harmony";
   by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage {
     name = "esprima-1.1.0-dev-harmony";
+    version = "1.1.0-dev-harmony";
     bin = true;
     src = fetchgit {
-      url = "https://github.com/ariya/esprima.git";
+      url = "git://github.com/ariya/esprima.git";
       rev = "a41a40b49046747b3af57341cda048bbd3d9df79";
       sha256 = "a304effb5bc8e53d0752aeb7e10ab15afd8381ef09056d0fc98d94a43e5c748a";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" =
-    self.by-version."esprima"."1.1.0-dev-harmony";
   by-spec."esprima"."~ 1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = self.buildNodePackage {
     name = "esprima-1.0.4";
+    version = "1.0.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
@@ -9390,12 +12341,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."esprima"."~ 2.0.0" =
+    self.by-version."esprima"."2.0.0";
   by-spec."esprima"."~0.9.9" =
     self.by-version."esprima"."0.9.9";
   by-version."esprima"."0.9.9" = self.buildNodePackage {
     name = "esprima-0.9.9";
+    version = "0.9.9";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz";
@@ -9404,10 +12362,12 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."esprima"."~1.0.0" =
-    self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.4" =
@@ -9416,6 +12376,7 @@
     self.by-version."esprima"."1.1.1";
   by-version."esprima"."1.1.1" = self.buildNodePackage {
     name = "esprima-1.1.1";
+    version = "1.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
@@ -9424,12 +12385,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."esprima"."~1.2.0" =
+    self.by-version."esprima"."1.2.4";
   by-spec."esprima-fb"."12001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."12001.1.0-dev-harmony-fb" = self.buildNodePackage {
     name = "esprima-fb-12001.1.0-dev-harmony-fb";
+    version = "12001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz";
@@ -9438,12 +12406,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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" = self.buildNodePackage {
     name = "esprima-fb-3001.1.0-dev-harmony-fb";
+    version = "3001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
@@ -9452,12 +12425,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esprima-fb"."~10001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."10001.1.0-dev-harmony-fb" = self.buildNodePackage {
     name = "esprima-fb-10001.1.0-dev-harmony-fb";
+    version = "10001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz";
@@ -9466,12 +12444,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."esprima-fb"."~12001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
   by-spec."esprima-fb"."~7001.0001.0000-dev-harmony-fb" =
     self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = self.buildNodePackage {
     name = "esprima-fb-7001.1.0-dev-harmony-fb";
+    version = "7001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz";
@@ -9480,12 +12465,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima-fb"."~8001.1001.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
+  by-version."esprima-fb"."8001.1001.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-8001.1001.0-dev-harmony-fb";
+    version = "8001.1001.0-dev-harmony-fb";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
+      sha1 = "c3190b05341d45643e093af70485ab4988e34d5e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esprima-six"."0.0.3" =
     self.by-version."esprima-six"."0.0.3";
   by-version."esprima-six"."0.0.3" = self.buildNodePackage {
     name = "esprima-six-0.0.3";
+    version = "0.0.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz";
@@ -9494,7 +12503,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esprima-six"."~0.0.3" =
     self.by-version."esprima-six"."0.0.3";
@@ -9502,6 +12515,7 @@
     self.by-version."esrefactor"."0.1.0";
   by-version."esrefactor"."0.1.0" = self.buildNodePackage {
     name = "esrefactor-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
@@ -9513,12 +12527,17 @@
       "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
       "escope-0.0.16" = self.by-version."escope"."0.0.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."estraverse".">= 0.0.2" =
     self.by-version."estraverse"."1.9.1";
   by-version."estraverse"."1.9.1" = self.buildNodePackage {
     name = "estraverse-1.9.1";
+    version = "1.9.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz";
@@ -9527,7 +12546,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."estraverse"."^1.9.1" =
     self.by-version."estraverse"."1.9.1";
@@ -9535,6 +12558,7 @@
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = self.buildNodePackage {
     name = "estraverse-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
@@ -9543,12 +12567,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."estraverse"."~1.5.0" =
     self.by-version."estraverse"."1.5.1";
   by-version."estraverse"."1.5.1" = self.buildNodePackage {
     name = "estraverse-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
@@ -9557,12 +12586,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."estraverse"."~1.8.0" =
     self.by-version."estraverse"."1.8.0";
   by-version."estraverse"."1.8.0" = self.buildNodePackage {
     name = "estraverse-1.8.0";
+    version = "1.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz";
@@ -9571,12 +12605,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esutils"."^1.1.6" =
     self.by-version."esutils"."1.1.6";
   by-version."esutils"."1.1.6" = self.buildNodePackage {
     name = "esutils-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
@@ -9585,12 +12624,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."esutils"."~1.0.0" =
     self.by-version."esutils"."1.0.0";
   by-version."esutils"."1.0.0" = self.buildNodePackage {
     name = "esutils-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
@@ -9599,12 +12643,37 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."etag"."~1.3.1" =
+    self.by-version."etag"."1.3.1";
+  by-version."etag"."1.3.1" = self.buildNodePackage {
+    name = "etag-1.3.1";
+    version = "1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.3.1.tgz";
+      name = "etag-1.3.1.tgz";
+      sha1 = "e51925728688a32dc4eea1cfa9ab4f734d055567";
+    };
+    deps = {
+      "crc-3.0.0" = self.by-version."crc"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."etag"."~1.4.0" =
     self.by-version."etag"."1.4.0";
   by-version."etag"."1.4.0" = self.buildNodePackage {
     name = "etag-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
@@ -9614,12 +12683,17 @@
     deps = {
       "crc-3.0.0" = self.by-version."crc"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."etag"."~1.5.0" =
     self.by-version."etag"."1.5.1";
   by-version."etag"."1.5.1" = self.buildNodePackage {
     name = "etag-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
@@ -9629,7 +12703,11 @@
     deps = {
       "crc-3.2.1" = self.by-version."crc"."3.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."etag"."~1.5.1" =
     self.by-version."etag"."1.5.1";
@@ -9637,6 +12715,7 @@
     self.by-version."event-emitter"."0.3.3";
   by-version."event-emitter"."0.3.3" = self.buildNodePackage {
     name = "event-emitter-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz";
@@ -9647,12 +12726,17 @@
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
       "d-0.1.1" = self.by-version."d"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."event-stream"."~0.5" =
     self.by-version."event-stream"."0.5.3";
   by-version."event-stream"."0.5.3" = self.buildNodePackage {
     name = "event-stream-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
@@ -9662,12 +12746,17 @@
     deps = {
       "optimist-0.2.8" = self.by-version."optimist"."0.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eventemitter2"."0.4.14" =
     self.by-version."eventemitter2"."0.4.14";
   by-version."eventemitter2"."0.4.14" = self.buildNodePackage {
     name = "eventemitter2-0.4.14";
+    version = "0.4.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
@@ -9676,7 +12765,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eventemitter2"."~0.4.13" =
     self.by-version."eventemitter2"."0.4.14";
@@ -9686,6 +12779,7 @@
     self.by-version."eventemitter3"."0.1.6";
   by-version."eventemitter3"."0.1.6" = self.buildNodePackage {
     name = "eventemitter3-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
@@ -9694,12 +12788,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."events"."~1.0.0" =
+  by-spec."events"."^1.0.0" =
     self.by-version."events"."1.0.2";
   by-version."events"."1.0.2" = self.buildNodePackage {
     name = "events-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz";
@@ -9708,12 +12807,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."events"."~1.0.0" =
+    self.by-version."events"."1.0.2";
   by-spec."events.node".">= 0.4.0" =
     self.by-version."events.node"."0.4.9";
   by-version."events.node"."0.4.9" = self.buildNodePackage {
     name = "events.node-0.4.9";
+    version = "0.4.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
@@ -9722,12 +12828,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."evernote"."^1.25.3" =
     self.by-version."evernote"."1.25.4";
   by-version."evernote"."1.25.4" = self.buildNodePackage {
     name = "evernote-1.25.4";
+    version = "1.25.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/evernote/-/evernote-1.25.4.tgz";
@@ -9737,12 +12848,17 @@
     deps = {
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."everyauth"."0.4.5" =
     self.by-version."everyauth"."0.4.5";
   by-version."everyauth"."0.4.5" = self.buildNodePackage {
     name = "everyauth-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
@@ -9758,14 +12874,19 @@
       "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
       "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
       "debug-0.5.0" = self.by-version."debug"."0.5.0";
-      "express-3.19.2" = self.by-version."express"."3.19.2";
+      "express-3.20.0" = self.by-version."express"."3.20.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."execSync"."^1.0.2" =
     self.by-version."execSync"."1.0.2";
   by-version."execSync"."1.0.2" = self.buildNodePackage {
     name = "execSync-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/execSync/-/execSync-1.0.2.tgz";
@@ -9775,12 +12896,17 @@
     deps = {
       "temp-0.5.1" = self.by-version."temp"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."exit"."0.1.2" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = self.buildNodePackage {
     name = "exit-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
@@ -9789,7 +12915,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."exit"."0.1.x" =
     self.by-version."exit"."0.1.2";
@@ -9799,6 +12929,7 @@
     self.by-version."express"."5.0.0-alpha.1";
   by-version."express"."5.0.0-alpha.1" = self.buildNodePackage {
     name = "express-5.0.0-alpha.1";
+    version = "5.0.0-alpha.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz";
@@ -9831,13 +12962,18 @@
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "express" = self.by-version."express"."5.0.0-alpha.1";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = self.buildNodePackage {
     name = "express-2.5.11";
+    version = "2.5.11";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
@@ -9850,47 +12986,95 @@
       "qs-0.4.2" = self.by-version."qs"."0.4.2";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."3.*" =
-    self.by-version."express"."3.19.2";
-  by-version."express"."3.19.2" = self.buildNodePackage {
-    name = "express-3.19.2";
+    self.by-version."express"."3.20.0";
+  by-version."express"."3.20.0" = self.buildNodePackage {
+    name = "express-3.20.0";
+    version = "3.20.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.19.2.tgz";
-      name = "express-3.19.2.tgz";
-      sha1 = "7f9b3ad8ae0f29d2df98cb3d8649dec8bcc47bf6";
+      url = "http://registry.npmjs.org/express/-/express-3.20.0.tgz";
+      name = "express-3.20.0.tgz";
+      sha1 = "9dac561e31a08e7d2852790d86d17c7b70bdd9ac";
     };
     deps = {
       "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.28.3" = self.by-version."connect"."2.28.3";
+      "connect-2.29.0" = self.by-version."connect"."2.29.0";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.11.1" = self.by-version."send"."0.11.1";
+      "send-0.12.1" = self.by-version."send"."0.12.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."3.17.2" =
+    self.by-version."express"."3.17.2";
+  by-version."express"."3.17.2" = self.buildNodePackage {
+    name = "express-3.17.2";
+    version = "3.17.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.17.2.tgz";
+      name = "express-3.17.2.tgz";
+      sha1 = "9593dd94af5d4776ea2b6dbff8c4d850a3381353";
+    };
+    deps = {
+      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+      "connect-2.26.1" = self.by-version."connect"."2.26.1";
+      "commander-1.3.2" = self.by-version."commander"."1.3.2";
+      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "crc-3.0.0" = self.by-version."crc"."3.0.0";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "depd-0.4.5" = self.by-version."depd"."0.4.5";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "methods-1.1.0" = self.by-version."methods"."1.1.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.9.2" = self.by-version."send"."0.9.2";
+      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."3.2.0" =
     self.by-version."express"."3.2.0";
   by-version."express"."3.2.0" = self.buildNodePackage {
     name = "express-3.2.0";
+    version = "3.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
@@ -9910,12 +13094,17 @@
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."3.4.4" =
     self.by-version."express"."3.4.4";
   by-version."express"."3.4.4" = self.buildNodePackage {
     name = "express-3.4.4";
+    version = "3.4.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
@@ -9935,14 +13124,19 @@
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.19.2";
+    self.by-version."express"."3.20.0";
   by-spec."express"."4.6.1" =
     self.by-version."express"."4.6.1";
   by-version."express"."4.6.1" = self.buildNodePackage {
     name = "express-4.6.1";
+    version = "4.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-4.6.1.tgz";
@@ -9973,33 +13167,34 @@
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express".">=3.0.0" =
-    self.by-version."express"."5.0.0-alpha.1";
-  by-spec."express".">=4.0.0" =
-    self.by-version."express"."5.0.0-alpha.1";
-  by-spec."express"."^4.0" =
-    self.by-version."express"."4.11.2";
-  by-version."express"."4.11.2" = self.buildNodePackage {
-    name = "express-4.11.2";
+    self.by-version."express"."4.12.0";
+  by-version."express"."4.12.0" = self.buildNodePackage {
+    name = "express-4.12.0";
+    version = "4.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz";
-      name = "express-4.11.2.tgz";
-      sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
+      url = "http://registry.npmjs.org/express/-/express-4.12.0.tgz";
+      name = "express-4.12.0.tgz";
+      sha1 = "739660fce86acbc11ba9c37dc96ff009dc9975e8";
     };
     deps = {
       "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
@@ -10007,22 +13202,31 @@
       "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.11.1" = self.by-version."send"."0.11.1";
-      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
+      "send-0.12.1" = self.by-version."send"."0.12.1";
+      "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1";
+      "type-is-1.6.0" = self.by-version."type-is"."1.6.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."express".">=4.0.0" =
+    self.by-version."express"."4.12.0";
+  by-spec."express"."^4.0" =
+    self.by-version."express"."4.12.0";
   by-spec."express"."~2.5.11" =
     self.by-version."express"."2.5.11";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = self.buildNodePackage {
     name = "express-3.1.2";
+    version = "3.1.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
@@ -10042,12 +13246,17 @@
       "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."~3.5.1" =
     self.by-version."express"."3.5.3";
   by-version."express"."3.5.3" = self.buildNodePackage {
     name = "express-3.5.3";
+    version = "3.5.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz";
@@ -10068,12 +13277,17 @@
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express"."~4.10.3" =
     self.by-version."express"."4.10.8";
   by-version."express"."4.10.8" = self.buildNodePackage {
     name = "express-4.10.8";
+    version = "4.10.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express/-/express-4.10.8.tgz";
@@ -10106,12 +13320,17 @@
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.12.4";
   by-version."express-form"."0.12.4" = self.buildNodePackage {
     name = "express-form-0.12.4";
+    version = "0.12.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz";
@@ -10123,14 +13342,19 @@
       "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1";
       "validator-2.1.0" = self.by-version."validator"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
-      self.by-version."express"."5.0.0-alpha.1"];
+      self.by-version."express"."4.12.0"];
+    os = [ ];
+    cpu = [ ];
   };
   "express-form" = self.by-version."express-form"."0.12.4";
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
   by-version."express-partials"."0.0.6" = self.buildNodePackage {
     name = "express-partials-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
@@ -10139,12 +13363,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express-session"."1.0.2" =
     self.by-version."express-session"."1.0.2";
   by-version."express-session"."1.0.2" = self.buildNodePackage {
     name = "express-session-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
@@ -10159,12 +13388,17 @@
       "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express-session"."^1.0.4" =
     self.by-version."express-session"."1.10.3";
   by-version."express-session"."1.10.3" = self.buildNodePackage {
     name = "express-session-1.10.3";
+    version = "1.10.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-session/-/express-session-1.10.3.tgz";
@@ -10182,16 +13416,19 @@
       "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."express-session"."~1.10.2" =
-    self.by-version."express-session"."1.10.3";
   by-spec."express-session"."~1.10.3" =
     self.by-version."express-session"."1.10.3";
   by-spec."express-session"."~1.8.2" =
     self.by-version."express-session"."1.8.2";
   by-version."express-session"."1.8.2" = self.buildNodePackage {
     name = "express-session-1.8.2";
+    version = "1.8.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
@@ -10209,12 +13446,17 @@
       "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."express-session"."~1.9.2" =
     self.by-version."express-session"."1.9.3";
   by-version."express-session"."1.9.3" = self.buildNodePackage {
     name = "express-session-1.9.3";
+    version = "1.9.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz";
@@ -10232,12 +13474,17 @@
       "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extend"."*" =
     self.by-version."extend"."2.0.0";
   by-version."extend"."2.0.0" = self.buildNodePackage {
     name = "extend-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz";
@@ -10246,7 +13493,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "extend" = self.by-version."extend"."2.0.0";
   by-spec."extend".">=1.1.3" =
@@ -10257,6 +13508,7 @@
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = self.buildNodePackage {
     name = "extend-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
@@ -10265,12 +13517,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extend"."~1.3.0" =
     self.by-version."extend"."1.3.0";
   by-version."extend"."1.3.0" = self.buildNodePackage {
     name = "extend-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
@@ -10279,12 +13536,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extend.js"."0.0.2" =
     self.by-version."extend.js"."0.0.2";
   by-version."extend.js"."0.0.2" = self.buildNodePackage {
     name = "extend.js-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
@@ -10293,12 +13555,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extract-opts"."~2.2.0" =
     self.by-version."extract-opts"."2.2.0";
   by-version."extract-opts"."2.2.0" = self.buildNodePackage {
     name = "extract-opts-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
@@ -10308,12 +13575,17 @@
     deps = {
       "typechecker-2.0.8" = self.by-version."typechecker"."2.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extsprintf"."1.0.0" =
     self.by-version."extsprintf"."1.0.0";
   by-version."extsprintf"."1.0.0" = self.buildNodePackage {
     name = "extsprintf-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
@@ -10322,12 +13594,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extsprintf"."1.0.2" =
     self.by-version."extsprintf"."1.0.2";
   by-version."extsprintf"."1.0.2" = self.buildNodePackage {
     name = "extsprintf-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
@@ -10336,12 +13613,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."extsprintf"."1.2.0" =
     self.by-version."extsprintf"."1.2.0";
   by-version."extsprintf"."1.2.0" = self.buildNodePackage {
     name = "extsprintf-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
@@ -10350,12 +13632,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
   by-version."eyes"."0.1.8" = self.buildNodePackage {
     name = "eyes-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
@@ -10364,7 +13651,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eyes"."~0.1.6" =
     self.by-version."eyes"."0.1.8";
@@ -10374,6 +13665,7 @@
     self.by-version."falafel"."0.1.6";
   by-version."falafel"."0.1.6" = self.buildNodePackage {
     name = "falafel-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz";
@@ -10383,12 +13675,17 @@
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fast-levenshtein"."~1.0.0" =
     self.by-version."fast-levenshtein"."1.0.6";
   by-version."fast-levenshtein"."1.0.6" = self.buildNodePackage {
     name = "fast-levenshtein-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz";
@@ -10397,12 +13694,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."favitest"."^1.0.3" =
     self.by-version."favitest"."1.0.7";
   by-version."favitest"."1.0.7" = self.buildNodePackage {
     name = "favitest-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/favitest/-/favitest-1.0.7.tgz";
@@ -10412,38 +13714,48 @@
     deps = {
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."favitest"."^1.0.7" =
     self.by-version."favitest"."1.0.7";
   by-spec."faye-websocket"."*" =
-    self.by-version."faye-websocket"."0.9.2";
-  by-version."faye-websocket"."0.9.2" = self.buildNodePackage {
-    name = "faye-websocket-0.9.2";
+    self.by-version."faye-websocket"."0.9.3";
+  by-version."faye-websocket"."0.9.3" = self.buildNodePackage {
+    name = "faye-websocket-0.9.3";
+    version = "0.9.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.2.tgz";
-      name = "faye-websocket-0.9.2.tgz";
-      sha1 = "872e633049fa10c3a55381f9ecac80bfb3053405";
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz";
+      name = "faye-websocket-0.9.3.tgz";
+      sha1 = "482a505b0df0ae626b969866d3bd740cdb962e83";
     };
     deps = {
-      "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1";
+      "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "faye-websocket" = self.by-version."faye-websocket"."0.9.2";
+  "faye-websocket" = self.by-version."faye-websocket"."0.9.3";
   by-spec."faye-websocket".">= 0.4.1" =
-    self.by-version."faye-websocket"."0.9.2";
+    self.by-version."faye-websocket"."0.9.3";
   by-spec."faye-websocket"."^0.7.3 || ^0.8.0 || ^0.9.0" =
-    self.by-version."faye-websocket"."0.9.2";
+    self.by-version."faye-websocket"."0.9.3";
   by-spec."faye-websocket"."~0.7.0" =
     self.by-version."faye-websocket"."0.7.3";
   by-version."faye-websocket"."0.7.3" = self.buildNodePackage {
     name = "faye-websocket-0.7.3";
+    version = "0.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz";
@@ -10451,14 +13763,19 @@
       sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11";
     };
     deps = {
-      "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1";
+      "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fb".">=0.0.9" =
     self.by-version."fb"."0.7.0";
   by-version."fb"."0.7.0" = self.buildNodePackage {
     name = "fb-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fb/-/fb-0.7.0.tgz";
@@ -10469,12 +13786,17 @@
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."feedparser".">=0.16.2" =
+  by-spec."feedparser"."0.19.2" =
     self.by-version."feedparser"."0.19.2";
   by-version."feedparser"."0.19.2" = self.buildNodePackage {
     name = "feedparser-0.19.2";
+    version = "0.19.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/feedparser/-/feedparser-0.19.2.tgz";
@@ -10488,12 +13810,19 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "resanitize-0.3.0" = self.by-version."resanitize"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."feedparser".">=0.16.2" =
+    self.by-version."feedparser"."0.19.2";
   by-spec."fetch-bower"."*" =
     self.by-version."fetch-bower"."2.0.0";
   by-version."fetch-bower"."2.0.0" = self.buildNodePackage {
     name = "fetch-bower-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz";
@@ -10506,29 +13835,20 @@
       "bower-1.3.12" = self.by-version."bower"."1.3.12";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "fetch-bower" = self.by-version."fetch-bower"."2.0.0";
   by-spec."fetch-bower".">=2 <3" =
     self.by-version."fetch-bower"."2.0.0";
-  by-spec."fibers"."1.0.5" =
-    self.by-version."fibers"."1.0.5";
-  by-version."fibers"."1.0.5" = self.buildNodePackage {
-    name = "fibers-1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fibers/-/fibers-1.0.5.tgz";
-      name = "fibers-1.0.5.tgz";
-      sha1 = "3bea1f697d8540bb3904961ad50939bdee1df678";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
   by-spec."fields"."~0.1.11" =
     self.by-version."fields"."0.1.23";
   by-version."fields"."0.1.23" = self.buildNodePackage {
     name = "fields-0.1.23";
+    version = "0.1.23";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz";
@@ -10540,12 +13860,17 @@
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fifo"."^0.1.4" =
     self.by-version."fifo"."0.1.4";
   by-version."fifo"."0.1.4" = self.buildNodePackage {
     name = "fifo-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz";
@@ -10554,12 +13879,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."figures"."^1.0.1" =
     self.by-version."figures"."1.3.5";
   by-version."figures"."1.3.5" = self.buildNodePackage {
     name = "figures-1.3.5";
+    version = "1.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz";
@@ -10568,7 +13898,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."figures"."^1.3.2" =
     self.by-version."figures"."1.3.5";
@@ -10576,6 +13910,7 @@
     self.by-version."file-uri-to-path"."0.0.2";
   by-version."file-uri-to-path"."0.0.2" = self.buildNodePackage {
     name = "file-uri-to-path-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz";
@@ -10584,12 +13919,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = self.buildNodePackage {
     name = "fileset-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
@@ -10600,12 +13940,17 @@
       "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finalhandler"."0.0.2" =
     self.by-version."finalhandler"."0.0.2";
   by-version."finalhandler"."0.0.2" = self.buildNodePackage {
     name = "finalhandler-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz";
@@ -10616,12 +13961,17 @@
       "debug-1.0.2" = self.by-version."debug"."1.0.2";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finalhandler"."0.0.3" =
     self.by-version."finalhandler"."0.0.3";
   by-version."finalhandler"."0.0.3" = self.buildNodePackage {
     name = "finalhandler-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.3.tgz";
@@ -10632,12 +13982,17 @@
       "debug-1.0.3" = self.by-version."debug"."1.0.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finalhandler"."0.2.0" =
     self.by-version."finalhandler"."0.2.0";
   by-version."finalhandler"."0.2.0" = self.buildNodePackage {
     name = "finalhandler-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
@@ -10648,12 +14003,17 @@
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finalhandler"."0.3.2" =
     self.by-version."finalhandler"."0.3.2";
   by-version."finalhandler"."0.3.2" = self.buildNodePackage {
     name = "finalhandler-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz";
@@ -10665,12 +14025,17 @@
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finalhandler"."0.3.3" =
     self.by-version."finalhandler"."0.3.3";
   by-version."finalhandler"."0.3.3" = self.buildNodePackage {
     name = "finalhandler-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
@@ -10682,12 +14047,17 @@
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."find-index"."^0.1.1" =
     self.by-version."find-index"."0.1.1";
   by-version."find-index"."0.1.1" = self.buildNodePackage {
     name = "find-index-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
@@ -10696,12 +14066,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."findit".">=1.1.0 <2.0.0" =
     self.by-version."findit"."1.2.0";
   by-version."findit"."1.2.0" = self.buildNodePackage {
     name = "findit-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
@@ -10710,12 +14085,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."findup-sync"."~0.1.0" =
     self.by-version."findup-sync"."0.1.3";
   by-version."findup-sync"."0.1.3" = self.buildNodePackage {
     name = "findup-sync-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
@@ -10726,7 +14106,11 @@
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.3";
@@ -10734,6 +14118,7 @@
     self.by-version."findup-sync"."0.2.1";
   by-version."findup-sync"."0.2.1" = self.buildNodePackage {
     name = "findup-sync-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz";
@@ -10743,12 +14128,17 @@
     deps = {
       "glob-4.3.5" = self.by-version."glob"."4.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finished"."1.2.2" =
     self.by-version."finished"."1.2.2";
   by-version."finished"."1.2.2" = self.buildNodePackage {
     name = "finished-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
@@ -10758,7 +14148,11 @@
     deps = {
       "ee-first-1.0.3" = self.by-version."ee-first"."1.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."finished"."~1.2.2" =
     self.by-version."finished"."1.2.2";
@@ -10766,6 +14160,7 @@
     self.by-version."first-chunk-stream"."1.0.0";
   by-version."first-chunk-stream"."1.0.0" = self.buildNodePackage {
     name = "first-chunk-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
@@ -10774,12 +14169,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."flagged-respawn"."~0.3.0" =
     self.by-version."flagged-respawn"."0.3.1";
   by-version."flagged-respawn"."0.3.1" = self.buildNodePackage {
     name = "flagged-respawn-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz";
@@ -10788,12 +14188,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.4.3";
   by-version."flatiron"."0.4.3" = self.buildNodePackage {
     name = "flatiron-0.4.3";
+    version = "0.4.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz";
@@ -10806,7 +14211,11 @@
       "prompt-0.2.14" = self.by-version."prompt"."0.2.14";
       "director-1.2.7" = self.by-version."director"."1.2.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "flatiron" = self.by-version."flatiron"."0.4.3";
   by-spec."flatiron"."~0.4.2" =
@@ -10815,6 +14224,7 @@
     self.by-version."flickrapi"."0.3.28";
   by-version."flickrapi"."0.3.28" = self.buildNodePackage {
     name = "flickrapi-0.3.28";
+    version = "0.3.28";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/flickrapi/-/flickrapi-0.3.28.tgz";
@@ -10829,12 +14239,17 @@
       "prompt-0.2.14" = self.by-version."prompt"."0.2.14";
       "request-2.26.0" = self.by-version."request"."2.26.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fluent-ffmpeg"."^2.0.0-rc3" =
     self.by-version."fluent-ffmpeg"."2.0.0-rc3";
   by-version."fluent-ffmpeg"."2.0.0-rc3" = self.buildNodePackage {
     name = "fluent-ffmpeg-2.0.0-rc3";
+    version = "2.0.0-rc3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.0-rc3.tgz";
@@ -10844,12 +14259,17 @@
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
   by-version."follow-redirects"."0.0.3" = self.buildNodePackage {
     name = "follow-redirects-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
@@ -10857,14 +14277,19 @@
       sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
     };
     deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."foreachasync"."^3.0.0" =
     self.by-version."foreachasync"."3.0.0";
   by-version."foreachasync"."3.0.0" = self.buildNodePackage {
     name = "foreachasync-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
@@ -10873,12 +14298,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."forever"."*" =
     self.by-version."forever"."0.14.1";
   by-version."forever"."0.14.1" = self.buildNodePackage {
     name = "forever-0.14.1";
+    version = "0.14.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/forever/-/forever-0.14.1.tgz";
@@ -10897,13 +14327,18 @@
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "forever" = self.by-version."forever"."0.14.1";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = self.buildNodePackage {
     name = "forever-agent-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
@@ -10912,12 +14347,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."forever-agent"."~0.5.0" =
     self.by-version."forever-agent"."0.5.2";
   by-version."forever-agent"."0.5.2" = self.buildNodePackage {
     name = "forever-agent-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
@@ -10926,12 +14366,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."forever-monitor"."*" =
     self.by-version."forever-monitor"."1.5.2";
   by-version."forever-monitor"."1.5.2" = self.buildNodePackage {
     name = "forever-monitor-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz";
@@ -10945,13 +14390,18 @@
       "watch-0.13.0" = self.by-version."watch"."0.13.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "forever-monitor" = self.by-version."forever-monitor"."1.5.2";
   by-spec."forever-monitor"."1.1.0" =
     self.by-version."forever-monitor"."1.1.0";
   by-version."forever-monitor"."1.1.0" = self.buildNodePackage {
     name = "forever-monitor-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
@@ -10966,7 +14416,11 @@
       "watch-0.5.1" = self.by-version."watch"."0.5.1";
       "utile-0.1.7" = self.by-version."utile"."0.1.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."forever-monitor"."~1.5.1" =
     self.by-version."forever-monitor"."1.5.2";
@@ -10974,6 +14428,7 @@
     self.by-version."form-data"."0.1.3";
   by-version."form-data"."0.1.3" = self.buildNodePackage {
     name = "form-data-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
@@ -10985,12 +14440,17 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."form-data".">=0.1.2" =
     self.by-version."form-data"."0.2.0";
   by-version."form-data"."0.2.0" = self.buildNodePackage {
     name = "form-data-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
@@ -11002,12 +14462,17 @@
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."form-data"."^0.1.2" =
     self.by-version."form-data"."0.1.4";
   by-version."form-data"."0.1.4" = self.buildNodePackage {
     name = "form-data-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
@@ -11019,12 +14484,17 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."form-data"."~0.0.3" =
     self.by-version."form-data"."0.0.10";
   by-version."form-data"."0.0.10" = self.buildNodePackage {
     name = "form-data-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
@@ -11036,7 +14506,11 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.2.10" = self.by-version."async"."0.2.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."form-data"."~0.1.0" =
     self.by-version."form-data"."0.1.4";
@@ -11046,6 +14520,7 @@
     self.by-version."formatio"."1.1.1";
   by-version."formatio"."1.1.1" = self.buildNodePackage {
     name = "formatio-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
@@ -11055,12 +14530,17 @@
     deps = {
       "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."formidable"."1.0.11" =
     self.by-version."formidable"."1.0.11";
   by-version."formidable"."1.0.11" = self.buildNodePackage {
     name = "formidable-1.0.11";
+    version = "1.0.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
@@ -11069,12 +14549,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."formidable"."1.0.13" =
     self.by-version."formidable"."1.0.13";
   by-version."formidable"."1.0.13" = self.buildNodePackage {
     name = "formidable-1.0.13";
+    version = "1.0.13";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
@@ -11083,12 +14568,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."formidable"."1.0.14" =
     self.by-version."formidable"."1.0.14";
   by-version."formidable"."1.0.14" = self.buildNodePackage {
     name = "formidable-1.0.14";
+    version = "1.0.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
@@ -11097,12 +14587,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."formidable"."1.0.x" =
     self.by-version."formidable"."1.0.17";
   by-version."formidable"."1.0.17" = self.buildNodePackage {
     name = "formidable-1.0.17";
+    version = "1.0.17";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
@@ -11111,12 +14606,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."forwarded"."~0.1.0" =
     self.by-version."forwarded"."0.1.0";
   by-version."forwarded"."0.1.0" = self.buildNodePackage {
     name = "forwarded-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
@@ -11125,12 +14625,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
   by-version."fresh"."0.1.0" = self.buildNodePackage {
     name = "fresh-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
@@ -11139,12 +14644,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fresh"."0.2.0" =
     self.by-version."fresh"."0.2.0";
   by-version."fresh"."0.2.0" = self.buildNodePackage {
     name = "fresh-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
@@ -11153,12 +14663,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fresh"."0.2.2" =
     self.by-version."fresh"."0.2.2";
   by-version."fresh"."0.2.2" = self.buildNodePackage {
     name = "fresh-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
@@ -11167,12 +14682,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fresh"."0.2.4" =
     self.by-version."fresh"."0.2.4";
   by-version."fresh"."0.2.4" = self.buildNodePackage {
     name = "fresh-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
@@ -11181,7 +14701,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fresh"."~0.2.1" =
     self.by-version."fresh"."0.2.4";
@@ -11189,6 +14713,7 @@
     self.by-version."fs-extended"."0.2.0";
   by-version."fs-extended"."0.2.0" = self.buildNodePackage {
     name = "fs-extended-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-extended/-/fs-extended-0.2.0.tgz";
@@ -11197,12 +14722,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."fs-extra"."^0.16.0" =
+  by-spec."fs-extra"."0.16.3" =
     self.by-version."fs-extra"."0.16.3";
   by-version."fs-extra"."0.16.3" = self.buildNodePackage {
     name = "fs-extra-0.16.3";
+    version = "0.16.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.3.tgz";
@@ -11214,14 +14744,21 @@
       "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."fs-extra"."^0.16.0" =
+    self.by-version."fs-extra"."0.16.3";
   by-spec."fs-extra"."~0.16.0" =
     self.by-version."fs-extra"."0.16.3";
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = self.buildNodePackage {
     name = "fs-extra-0.6.4";
+    version = "0.6.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
@@ -11234,12 +14771,17 @@
       "jsonfile-1.0.1" = self.by-version."jsonfile"."1.0.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fs-extra"."~0.7.0" =
     self.by-version."fs-extra"."0.7.1";
   by-version."fs-extra"."0.7.1" = self.buildNodePackage {
     name = "fs-extra-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.7.1.tgz";
@@ -11252,12 +14794,17 @@
       "jsonfile-1.1.1" = self.by-version."jsonfile"."1.1.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fs-vacuum"."~1.2.5" =
     self.by-version."fs-vacuum"."1.2.5";
   by-version."fs-vacuum"."1.2.5" = self.buildNodePackage {
     name = "fs-vacuum-1.2.5";
+    version = "1.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz";
@@ -11269,12 +14816,17 @@
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
   by-version."fs-walk"."0.0.1" = self.buildNodePackage {
     name = "fs-walk-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
@@ -11284,13 +14836,18 @@
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "fs-walk" = self.by-version."fs-walk"."0.0.1";
   by-spec."fs-write-stream-atomic"."~1.0.2" =
     self.by-version."fs-write-stream-atomic"."1.0.2";
   by-version."fs-write-stream-atomic"."1.0.2" = self.buildNodePackage {
     name = "fs-write-stream-atomic-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz";
@@ -11300,12 +14857,17 @@
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fs.extra".">=1.2.0 <2.0.0" =
     self.by-version."fs.extra"."1.3.2";
   by-version."fs.extra"."1.3.2" = self.buildNodePackage {
     name = "fs.extra-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
@@ -11317,14 +14879,40 @@
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "walk-2.3.9" = self.by-version."walk"."2.3.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fs.extra".">=1.2.1 <2" =
     self.by-version."fs.extra"."1.3.2";
+  by-spec."fs.notify"."0.0.4" =
+    self.by-version."fs.notify"."0.0.4";
+  by-version."fs.notify"."0.0.4" = self.buildNodePackage {
+    name = "fs.notify-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz";
+      name = "fs.notify-0.0.4.tgz";
+      sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d";
+    };
+    deps = {
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "retry-0.6.1" = self.by-version."retry"."0.6.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."fsevents"."^0.3.1" =
     self.by-version."fsevents"."0.3.5";
   by-version."fsevents"."0.3.5" = self.buildNodePackage {
     name = "fsevents-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz";
@@ -11334,12 +14922,19 @@
     deps = {
       "nan-1.5.3" = self.by-version."nan"."1.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ "darwin" ];
+    cpu = [ ];
   };
+  by-spec."fsevents"."~0.3.1" =
+    self.by-version."fsevents"."0.3.5";
   by-spec."fstream"."^1.0.0" =
     self.by-version."fstream"."1.0.4";
   by-version."fstream"."1.0.4" = self.buildNodePackage {
     name = "fstream-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz";
@@ -11352,7 +14947,11 @@
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fstream"."^1.0.2" =
     self.by-version."fstream"."1.0.4";
@@ -11360,6 +14959,7 @@
     self.by-version."fstream"."0.1.31";
   by-version."fstream"."0.1.31" = self.buildNodePackage {
     name = "fstream-0.1.31";
+    version = "0.1.31";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
@@ -11372,7 +14972,11 @@
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fstream"."~0.1.22" =
     self.by-version."fstream"."0.1.31";
@@ -11388,6 +14992,7 @@
     self.by-version."fstream-ignore"."0.0.7";
   by-version."fstream-ignore"."0.0.7" = self.buildNodePackage {
     name = "fstream-ignore-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
@@ -11399,12 +15004,17 @@
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fstream-ignore"."^1.0.0" =
     self.by-version."fstream-ignore"."1.0.2";
   by-version."fstream-ignore"."1.0.2" = self.buildNodePackage {
     name = "fstream-ignore-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz";
@@ -11416,7 +15026,11 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fstream-ignore"."~1.0.1" =
     self.by-version."fstream-ignore"."1.0.2";
@@ -11424,6 +15038,7 @@
     self.by-version."fstream-npm"."1.0.1";
   by-version."fstream-npm"."1.0.1" = self.buildNodePackage {
     name = "fstream-npm-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz";
@@ -11434,7 +15049,11 @@
       "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."fstream-npm"."~1.0.1" =
     self.by-version."fstream-npm"."1.0.1";
@@ -11442,6 +15061,7 @@
     self.by-version."ftp"."0.3.8";
   by-version."ftp"."0.3.8" = self.buildNodePackage {
     name = "ftp-0.3.8";
+    version = "0.3.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ftp/-/ftp-0.3.8.tgz";
@@ -11452,12 +15072,17 @@
       "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gapitoken"."~0.1.2" =
     self.by-version."gapitoken"."0.1.3";
   by-version."gapitoken"."0.1.3" = self.buildNodePackage {
     name = "gapitoken-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.3.tgz";
@@ -11467,12 +15092,17 @@
     deps = {
       "jws-0.0.2" = self.by-version."jws"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gauge"."~1.1.0" =
     self.by-version."gauge"."1.1.0";
   by-version."gauge"."1.1.0" = self.buildNodePackage {
     name = "gauge-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz";
@@ -11486,12 +15116,17 @@
       "lodash.padleft-3.0.0" = self.by-version."lodash.padleft"."3.0.0";
       "lodash.padright-3.0.0" = self.by-version."lodash.padright"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gaze"."^0.5.1" =
     self.by-version."gaze"."0.5.1";
   by-version."gaze"."0.5.1" = self.buildNodePackage {
     name = "gaze-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
@@ -11501,12 +15136,17 @@
     deps = {
       "globule-0.1.0" = self.by-version."globule"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gelf-stream"."~0.2.4" =
     self.by-version."gelf-stream"."0.2.4";
   by-version."gelf-stream"."0.2.4" = self.buildNodePackage {
     name = "gelf-stream-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
@@ -11516,12 +15156,17 @@
     deps = {
       "gelfling-0.2.0" = self.by-version."gelfling"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gelfling"."~0.2.0" =
     self.by-version."gelfling"."0.2.0";
   by-version."gelfling"."0.2.0" = self.buildNodePackage {
     name = "gelfling-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
@@ -11530,12 +15175,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."get-stdin"."*" =
     self.by-version."get-stdin"."4.0.1";
   by-version."get-stdin"."4.0.1" = self.buildNodePackage {
     name = "get-stdin-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
@@ -11544,7 +15194,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."get-stdin"."^4.0.1" =
     self.by-version."get-stdin"."4.0.1";
@@ -11552,6 +15206,7 @@
     self.by-version."get-uri"."0.1.3";
   by-version."get-uri"."0.1.3" = self.buildNodePackage {
     name = "get-uri-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/get-uri/-/get-uri-0.1.3.tgz";
@@ -11566,12 +15221,17 @@
       "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."get-youtube-id"."^0.1.3" =
     self.by-version."get-youtube-id"."0.1.3";
   by-version."get-youtube-id"."0.1.3" = self.buildNodePackage {
     name = "get-youtube-id-0.1.3";
+    version = "0.1.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
@@ -11580,12 +15240,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
   by-version."getmac"."1.0.6" = self.buildNodePackage {
     name = "getmac-1.0.6";
+    version = "1.0.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz";
@@ -11595,12 +15260,17 @@
     deps = {
       "extract-opts-2.2.0" = self.by-version."extract-opts"."2.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."getobject"."~0.1.0" =
     self.by-version."getobject"."0.1.0";
   by-version."getobject"."0.1.0" = self.buildNodePackage {
     name = "getobject-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
@@ -11609,12 +15279,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."git-run"."*" =
     self.by-version."git-run"."0.3.1";
   by-version."git-run"."0.3.1" = self.buildNodePackage {
     name = "git-run-0.3.1";
+    version = "0.3.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz";
@@ -11625,13 +15300,18 @@
       "minilog-2.0.6" = self.by-version."minilog"."2.0.6";
       "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "git-run" = self.by-version."git-run"."0.3.1";
   by-spec."github-url-from-git"."^1.3.0" =
     self.by-version."github-url-from-git"."1.4.0";
   by-version."github-url-from-git"."1.4.0" = self.buildNodePackage {
     name = "github-url-from-git-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
@@ -11640,7 +15320,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."github-url-from-git"."~1.4.0" =
     self.by-version."github-url-from-git"."1.4.0";
@@ -11648,6 +15332,7 @@
     self.by-version."github-url-from-username-repo"."1.0.2";
   by-version."github-url-from-username-repo"."1.0.2" = self.buildNodePackage {
     name = "github-url-from-username-repo-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
@@ -11656,7 +15341,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."github-url-from-username-repo"."~1.0.0" =
     self.by-version."github-url-from-username-repo"."1.0.2";
@@ -11666,6 +15355,7 @@
     self.by-version."glob"."4.4.0";
   by-version."glob"."4.4.0" = self.buildNodePackage {
     name = "glob-4.4.0";
+    version = "4.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-4.4.0.tgz";
@@ -11678,12 +15368,17 @@
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."3.2.3" =
     self.by-version."glob"."3.2.3";
   by-version."glob"."3.2.3" = self.buildNodePackage {
     name = "glob-3.2.3";
+    version = "3.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
@@ -11695,12 +15390,17 @@
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
   by-version."glob"."3.2.11" = self.buildNodePackage {
     name = "glob-3.2.11";
+    version = "3.2.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
@@ -11711,7 +15411,11 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."3.x" =
     self.by-version."glob"."3.2.11";
@@ -11719,6 +15423,7 @@
     self.by-version."glob"."4.0.6";
   by-version."glob"."4.0.6" = self.buildNodePackage {
     name = "glob-4.0.6";
+    version = "4.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
@@ -11731,26 +15436,31 @@
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."4.x" =
     self.by-version."glob"."4.4.0";
   by-spec."glob".">=3.2.7 <4" =
     self.by-version."glob"."3.2.11";
-  by-spec."glob"."^3.2.1" =
-    self.by-version."glob"."3.2.11";
   by-spec."glob"."^4.0.2" =
     self.by-version."glob"."4.4.0";
   by-spec."glob"."^4.0.5" =
     self.by-version."glob"."4.4.0";
   by-spec."glob"."^4.3.1" =
     self.by-version."glob"."4.4.0";
+  by-spec."glob"."^4.3.5" =
+    self.by-version."glob"."4.4.0";
   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" = self.buildNodePackage {
     name = "glob-3.1.21";
+    version = "3.1.21";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
@@ -11762,7 +15472,11 @@
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
       "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."~3.2.6" =
     self.by-version."glob"."3.2.11";
@@ -11780,6 +15494,7 @@
     self.by-version."glob"."4.2.2";
   by-version."glob"."4.2.2" = self.buildNodePackage {
     name = "glob-4.2.2";
+    version = "4.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz";
@@ -11792,12 +15507,17 @@
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."~4.3.0" =
     self.by-version."glob"."4.3.5";
   by-version."glob"."4.3.5" = self.buildNodePackage {
     name = "glob-4.3.5";
+    version = "4.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz";
@@ -11810,16 +15530,19 @@
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."glob"."~4.3.1" =
-    self.by-version."glob"."4.3.5";
-  by-spec."glob"."~4.3.5" =
-    self.by-version."glob"."4.3.5";
+  by-spec."glob"."~4.4.0" =
+    self.by-version."glob"."4.4.0";
   by-spec."glob-parent"."^1.0.0" =
     self.by-version."glob-parent"."1.0.0";
   by-version."glob-parent"."1.0.0" = self.buildNodePackage {
     name = "glob-parent-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.0.0.tgz";
@@ -11829,12 +15552,17 @@
     deps = {
       "is-glob-0.3.0" = self.by-version."is-glob"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob-stream"."^3.1.5" =
     self.by-version."glob-stream"."3.1.18";
   by-version."glob-stream"."3.1.18" = self.buildNodePackage {
     name = "glob-stream-3.1.18";
+    version = "3.1.18";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
@@ -11849,12 +15577,17 @@
       "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0";
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob-watcher"."^0.0.6" =
     self.by-version."glob-watcher"."0.0.6";
   by-version."glob-watcher"."0.0.6" = self.buildNodePackage {
     name = "glob-watcher-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
@@ -11864,12 +15597,17 @@
     deps = {
       "gaze-0.5.1" = self.by-version."gaze"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob2base"."^0.0.12" =
     self.by-version."glob2base"."0.0.12";
   by-version."glob2base"."0.0.12" = self.buildNodePackage {
     name = "glob2base-0.0.12";
+    version = "0.0.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
@@ -11879,12 +15617,17 @@
     deps = {
       "find-index-0.1.1" = self.by-version."find-index"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."global"."https://github.com/component/global/archive/v2.0.1.tar.gz" =
     self.by-version."global"."2.0.1";
   by-version."global"."2.0.1" = self.buildNodePackage {
     name = "global-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "https://github.com/component/global/archive/v2.0.1.tar.gz";
@@ -11893,12 +15636,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."globule"."~0.1.0" =
     self.by-version."globule"."0.1.0";
   by-version."globule"."0.1.0" = self.buildNodePackage {
     name = "globule-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
@@ -11910,12 +15658,17 @@
       "glob-3.1.21" = self.by-version."glob"."3.1.21";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."googleapis"."0.8.0" =
     self.by-version."googleapis"."0.8.0";
   by-version."googleapis"."0.8.0" = self.buildNodePackage {
     name = "googleapis-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/googleapis/-/googleapis-0.8.0.tgz";
@@ -11927,12 +15680,17 @@
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."googleapis"."^1.0.20" =
     self.by-version."googleapis"."1.1.3";
   by-version."googleapis"."1.1.3" = self.buildNodePackage {
     name = "googleapis-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.3.tgz";
@@ -11945,12 +15703,17 @@
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "string-template-0.2.0" = self.by-version."string-template"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."got"."^0.3.0" =
     self.by-version."got"."0.3.0";
   by-version."got"."0.3.0" = self.buildNodePackage {
     name = "got-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz";
@@ -11960,12 +15723,17 @@
     deps = {
       "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."got"."^1.2.2" =
     self.by-version."got"."1.2.2";
   by-version."got"."1.2.2" = self.buildNodePackage {
     name = "got-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
@@ -11975,12 +15743,17 @@
     deps = {
       "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."got"."^2.3.2" =
+  by-spec."got"."^2.4.0" =
     self.by-version."got"."2.4.0";
   by-version."got"."2.4.0" = self.buildNodePackage {
     name = "got-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/got/-/got-2.4.0.tgz";
@@ -11998,14 +15771,17 @@
       "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
       "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."got"."^2.4.0" =
-    self.by-version."got"."2.4.0";
   by-spec."graceful-fs"."1.2" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
     name = "graceful-fs-1.2.3";
+    version = "1.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
@@ -12014,12 +15790,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.3";
   by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
     name = "graceful-fs-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
@@ -12028,12 +15809,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."graceful-fs"."2 || 3" =
     self.by-version."graceful-fs"."3.0.5";
   by-version."graceful-fs"."3.0.5" = self.buildNodePackage {
     name = "graceful-fs-3.0.5";
+    version = "3.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
@@ -12042,7 +15828,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."graceful-fs"."3" =
     self.by-version."graceful-fs"."3.0.5";
@@ -12080,6 +15870,7 @@
     self.by-version."gridfs-stream"."1.0.1";
   by-version."gridfs-stream"."1.0.1" = self.buildNodePackage {
     name = "gridfs-stream-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.0.1.tgz";
@@ -12088,13 +15879,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "gridfs-stream" = self.by-version."gridfs-stream"."1.0.1";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = self.buildNodePackage {
     name = "growl-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
@@ -12103,12 +15899,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."growl"."1.8.1" =
     self.by-version."growl"."1.8.1";
   by-version."growl"."1.8.1" = self.buildNodePackage {
     name = "growl-1.8.1";
+    version = "1.8.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
@@ -12117,12 +15918,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."grunt"."0.4.x" =
     self.by-version."grunt"."0.4.5";
   by-version."grunt"."0.4.5" = self.buildNodePackage {
     name = "grunt-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
@@ -12151,7 +15957,11 @@
       "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0";
       "grunt-legacy-log-0.1.1" = self.by-version."grunt-legacy-log"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."grunt".">=0.4.0" =
     self.by-version."grunt"."0.4.5";
@@ -12165,6 +15975,7 @@
     self.by-version."grunt-cli"."0.1.13";
   by-version."grunt-cli"."0.1.13" = self.buildNodePackage {
     name = "grunt-cli-0.1.13";
+    version = "0.1.13";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
@@ -12176,32 +15987,42 @@
       "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
       "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.12.1";
-  by-version."grunt-contrib-cssmin"."0.12.1" = self.buildNodePackage {
-    name = "grunt-contrib-cssmin-0.12.1";
+    self.by-version."grunt-contrib-cssmin"."0.12.2";
+  by-version."grunt-contrib-cssmin"."0.12.2" = self.buildNodePackage {
+    name = "grunt-contrib-cssmin-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.1.tgz";
-      name = "grunt-contrib-cssmin-0.12.1.tgz";
-      sha1 = "8a14644bdd60ee2d66a5a7b941a37de7c8fe532a";
+      url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.2.tgz";
+      name = "grunt-contrib-cssmin-0.12.2.tgz";
+      sha1 = "254957427abdf63cd18f0690d34c0083fb544cff";
     };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "clean-css-3.0.10" = self.by-version."clean-css"."3.0.10";
       "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.1";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.2";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.11.0";
   by-version."grunt-contrib-jshint"."0.11.0" = self.buildNodePackage {
     name = "grunt-contrib-jshint-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.0.tgz";
@@ -12212,14 +16033,19 @@
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
       "jshint-2.6.0" = self.by-version."jshint"."2.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.0";
   by-spec."grunt-contrib-less"."*" =
     self.by-version."grunt-contrib-less"."1.0.0";
   by-version."grunt-contrib-less"."1.0.0" = self.buildNodePackage {
     name = "grunt-contrib-less-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz";
@@ -12232,14 +16058,19 @@
       "less-2.4.0" = self.by-version."less"."2.4.0";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.0";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-version."grunt-contrib-requirejs"."0.4.4" = self.buildNodePackage {
     name = "grunt-contrib-requirejs-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
@@ -12249,35 +16080,45 @@
     deps = {
       "requirejs-2.1.16" = self.by-version."requirejs"."2.1.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.7.0";
-  by-version."grunt-contrib-uglify"."0.7.0" = self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.7.0";
+    self.by-version."grunt-contrib-uglify"."0.8.0";
+  by-version."grunt-contrib-uglify"."0.8.0" = self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.7.0.tgz";
-      name = "grunt-contrib-uglify-0.7.0.tgz";
-      sha1 = "79dde81a62cec6ffa35b47a32833706744f8e787";
+      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.8.0.tgz";
+      name = "grunt-contrib-uglify-0.8.0.tgz";
+      sha1 = "6897a450fab8563c9885e388bd705a5ff2c3937e";
     };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
       "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
       "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.7.0";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.8.0";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.10.1";
   by-version."grunt-karma"."0.10.1" = self.buildNodePackage {
     name = "grunt-karma-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.10.1.tgz";
@@ -12287,15 +16128,20 @@
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"
       self.by-version."karma"."0.12.31"];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-karma" = self.by-version."grunt-karma"."0.10.1";
   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" = self.buildNodePackage {
     name = "grunt-legacy-log-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
@@ -12308,12 +16154,17 @@
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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" = self.buildNodePackage {
     name = "grunt-legacy-util-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
@@ -12329,12 +16180,17 @@
       "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
   by-version."grunt-sed"."0.1.1" = self.buildNodePackage {
     name = "grunt-sed-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
@@ -12344,14 +16200,19 @@
     deps = {
       "replace-0.2.10" = self.by-version."replace"."0.2.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
   };
   "grunt-sed" = self.by-version."grunt-sed"."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" = self.buildNodePackage {
     name = "guifi-earth-0.2.1";
+    version = "0.2.1";
     bin = true;
     src = fetchurl {
       url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
@@ -12359,19 +16220,24 @@
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     deps = {
-      "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0";
+      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
       "jade-1.9.2" = self.by-version."jade"."1.9.2";
       "q-2.0.3" = self.by-version."q"."2.0.3";
       "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
       "msgpack-0.2.6" = self.by-version."msgpack"."0.2.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "guifi-earth" = self.by-version."guifi-earth"."0.2.1";
   by-spec."gulp"."*" =
     self.by-version."gulp"."3.8.11";
   by-version."gulp"."3.8.11" = self.buildNodePackage {
     name = "gulp-3.8.11";
+    version = "3.8.11";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz";
@@ -12393,13 +16259,18 @@
       "v8flags-2.0.2" = self.by-version."v8flags"."2.0.2";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "gulp" = self.by-version."gulp"."3.8.11";
   by-spec."gulp-util"."^3.0.0" =
     self.by-version."gulp-util"."3.0.3";
   by-version."gulp-util"."3.0.3" = self.buildNodePackage {
     name = "gulp-util-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz";
@@ -12415,7 +16286,7 @@
       "lodash.reescape-3.0.1" = self.by-version."lodash.reescape"."3.0.1";
       "lodash.reevaluate-3.0.1" = self.by-version."lodash.reevaluate"."3.0.1";
       "lodash.reinterpolate-3.0.1" = self.by-version."lodash.reinterpolate"."3.0.1";
-      "lodash.template-3.2.0" = self.by-version."lodash.template"."3.2.0";
+      "lodash.template-3.3.0" = self.by-version."lodash.template"."3.3.0";
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
@@ -12423,12 +16294,17 @@
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gzip-size"."^1.0.0" =
     self.by-version."gzip-size"."1.0.0";
   by-version."gzip-size"."1.0.0" = self.buildNodePackage {
     name = "gzip-size-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
@@ -12439,12 +16315,17 @@
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
   by-version."gzippo"."0.2.0" = self.buildNodePackage {
     name = "gzippo-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
@@ -12454,13 +16335,18 @@
     deps = {
       "send-0.12.1" = self.by-version."send"."0.12.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
   by-spec."handlebars"."1.3.x" =
     self.by-version."handlebars"."1.3.0";
   by-version."handlebars"."1.3.0" = self.buildNodePackage {
     name = "handlebars-1.3.0";
+    version = "1.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
@@ -12469,9 +16355,13 @@
     };
     deps = {
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
       "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."handlebars"."~1.3.0" =
     self.by-version."handlebars"."1.3.0";
@@ -12479,6 +16369,7 @@
     self.by-version."handlebars"."2.0.0";
   by-version."handlebars"."2.0.0" = self.buildNodePackage {
     name = "handlebars-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
@@ -12487,14 +16378,38 @@
     };
     deps = {
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
       "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has"."^1.0.0" =
+    self.by-version."has"."1.0.0";
+  by-version."has"."1.0.0" = self.buildNodePackage {
+    name = "has-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has/-/has-1.0.0.tgz";
+      name = "has-1.0.0.tgz";
+      sha1 = "56c6582d23b40f3a5458f68ba79bc6c4bef203b3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."has-ansi"."^0.1.0" =
     self.by-version."has-ansi"."0.1.0";
   by-version."has-ansi"."0.1.0" = self.buildNodePackage {
     name = "has-ansi-0.1.0";
+    version = "0.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
@@ -12504,12 +16419,17 @@
     deps = {
       "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."has-binary-data"."0.1.1" =
     self.by-version."has-binary-data"."0.1.1";
   by-version."has-binary-data"."0.1.1" = self.buildNodePackage {
     name = "has-binary-data-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz";
@@ -12519,12 +16439,17 @@
     deps = {
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."has-cors"."1.0.3" =
     self.by-version."has-cors"."1.0.3";
   by-version."has-cors"."1.0.3" = self.buildNodePackage {
     name = "has-cors-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz";
@@ -12534,12 +16459,17 @@
     deps = {
       "global-2.0.1" = self.by-version."global"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."has-unicode"."^1.0.0" =
     self.by-version."has-unicode"."1.0.0";
   by-version."has-unicode"."1.0.0" = self.buildNodePackage {
     name = "has-unicode-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz";
@@ -12548,12 +16478,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hash.js"."^1.0.0" =
     self.by-version."hash.js"."1.0.2";
   by-version."hash.js"."1.0.2" = self.buildNodePackage {
     name = "hash.js-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz";
@@ -12563,12 +16498,17 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hasher"."~1.2.0" =
     self.by-version."hasher"."1.2.0";
   by-version."hasher"."1.2.0" = self.buildNodePackage {
     name = "hasher-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
@@ -12578,12 +16518,17 @@
     deps = {
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hashish"."*" =
     self.by-version."hashish"."0.0.4";
   by-version."hashish"."0.0.4" = self.buildNodePackage {
     name = "hashish-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz";
@@ -12593,14 +16538,21 @@
     deps = {
       "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hashish"."0.0.4" =
     self.by-version."hashish"."0.0.4";
+  by-spec."hashish"."0.0.x" =
+    self.by-version."hashish"."0.0.4";
   by-spec."hashring"."1.0.1" =
     self.by-version."hashring"."1.0.1";
   by-version."hashring"."1.0.1" = self.buildNodePackage {
     name = "hashring-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
@@ -12611,12 +16563,17 @@
       "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
       "simple-lru-cache-0.0.1" = self.by-version."simple-lru-cache"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hat"."*" =
     self.by-version."hat"."0.0.3";
   by-version."hat"."0.0.3" = self.buildNodePackage {
     name = "hat-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
@@ -12625,7 +16582,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hat"."0.0.3" =
     self.by-version."hat"."0.0.3";
@@ -12637,6 +16598,7 @@
     self.by-version."hawk"."1.1.1";
   by-version."hawk"."1.1.1" = self.buildNodePackage {
     name = "hawk-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
@@ -12649,12 +16611,17 @@
       "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
       "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hawk"."~0.10.2" =
     self.by-version."hawk"."0.10.2";
   by-version."hawk"."0.10.2" = self.buildNodePackage {
     name = "hawk-0.10.2";
+    version = "0.10.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
@@ -12667,12 +16634,17 @@
       "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3";
       "sntp-0.1.4" = self.by-version."sntp"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = self.buildNodePackage {
     name = "hawk-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
@@ -12685,12 +16657,17 @@
       "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
       "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hawk"."~2.3.0" =
     self.by-version."hawk"."2.3.1";
   by-version."hawk"."2.3.1" = self.buildNodePackage {
     name = "hawk-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
@@ -12703,12 +16680,17 @@
       "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hbo-dnsd"."0.9.8" =
     self.by-version."hbo-dnsd"."0.9.8";
   by-version."hbo-dnsd"."0.9.8" = self.buildNodePackage {
     name = "hbo-dnsd-0.9.8";
+    version = "0.9.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hbo-dnsd/-/hbo-dnsd-0.9.8.tgz";
@@ -12719,12 +16701,17 @@
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "defaultable-0.7.2" = self.by-version."defaultable"."0.7.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."he"."~0.3.6" =
     self.by-version."he"."0.3.6";
   by-version."he"."0.3.6" = self.buildNodePackage {
     name = "he-0.3.6";
+    version = "0.3.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
@@ -12733,12 +16720,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."headless"."^0.1.7" =
+    self.by-version."headless"."0.1.7";
+  by-version."headless"."0.1.7" = self.buildNodePackage {
+    name = "headless-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/headless/-/headless-0.1.7.tgz";
+      name = "headless-0.1.7.tgz";
+      sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."heapdump"."^0.2.9" =
     self.by-version."heapdump"."0.2.10";
   by-version."heapdump"."0.2.10" = self.buildNodePackage {
     name = "heapdump-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/heapdump/-/heapdump-0.2.10.tgz";
@@ -12747,12 +16758,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hipache"."*" =
     self.by-version."hipache"."0.3.1";
   by-version."hipache"."0.3.1" = self.buildNodePackage {
     name = "hipache-0.3.1";
+    version = "0.3.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
@@ -12765,13 +16781,18 @@
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
     self.by-version."hiredis"."0.2.0";
   by-version."hiredis"."0.2.0" = self.buildNodePackage {
     name = "hiredis-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hiredis/-/hiredis-0.2.0.tgz";
@@ -12782,12 +16803,17 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.5.3" = self.by-version."nan"."1.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hoek"."0.7.x" =
     self.by-version."hoek"."0.7.6";
   by-version."hoek"."0.7.6" = self.buildNodePackage {
     name = "hoek-0.7.6";
+    version = "0.7.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
@@ -12796,12 +16822,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
   by-version."hoek"."0.9.1" = self.buildNodePackage {
     name = "hoek-0.9.1";
+    version = "0.9.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
@@ -12810,12 +16841,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
     self.by-version."hoek"."2.11.0";
   by-version."hoek"."2.11.0" = self.buildNodePackage {
     name = "hoek-2.11.0";
+    version = "2.11.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz";
@@ -12824,12 +16860,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hooker"."~0.2.3" =
     self.by-version."hooker"."0.2.3";
   by-version."hooker"."0.2.3" = self.buildNodePackage {
     name = "hooker-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
@@ -12838,12 +16879,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hooks"."0.2.1" =
     self.by-version."hooks"."0.2.1";
   by-version."hooks"."0.2.1" = self.buildNodePackage {
     name = "hooks-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
@@ -12852,12 +16898,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hooks"."0.3.2" =
     self.by-version."hooks"."0.3.2";
   by-version."hooks"."0.3.2" = self.buildNodePackage {
     name = "hooks-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz";
@@ -12866,12 +16917,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."hosted-git-info"."^1.5.3" =
     self.by-version."hosted-git-info"."1.5.3";
   by-version."hosted-git-info"."1.5.3" = self.buildNodePackage {
     name = "hosted-git-info-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.5.3.tgz";
@@ -12880,12 +16936,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."html-md"."^3.0.2" =
     self.by-version."html-md"."3.0.2";
   by-version."html-md"."3.0.2" = self.buildNodePackage {
     name = "html-md-3.0.2";
+    version = "3.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/html-md/-/html-md-3.0.2.tgz";
@@ -12897,12 +16958,17 @@
       "fs-extra-0.7.1" = self.by-version."fs-extra"."0.7.1";
       "jsdom-0.8.11" = self.by-version."jsdom"."0.8.11";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."html5"."~1.0.5" =
     self.by-version."html5"."1.0.5";
   by-version."html5"."1.0.5" = self.buildNodePackage {
     name = "html5-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
@@ -12912,14 +16978,19 @@
     deps = {
       "opts-1.2.2" = self.by-version."opts"."1.2.2";
       "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0";
+    };
+    optionalDependencies = {
       "jsdom-0.11.1" = self.by-version."jsdom"."0.11.1";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."html5-entities"."^1.0.0" =
     self.by-version."html5-entities"."1.0.0";
   by-version."html5-entities"."1.0.0" = self.buildNodePackage {
     name = "html5-entities-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
@@ -12928,7 +16999,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."html5-entities"."~1.0.0" =
     self.by-version."html5-entities"."1.0.0";
@@ -12936,6 +17011,7 @@
     self.by-version."htmlparser2"."3.8.2";
   by-version."htmlparser2"."3.8.2" = self.buildNodePackage {
     name = "htmlparser2-3.8.2";
+    version = "3.8.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz";
@@ -12949,7 +17025,11 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."htmlparser2".">= 3.1.5 <4" =
     self.by-version."htmlparser2"."3.8.2";
@@ -12961,6 +17041,7 @@
     self.by-version."htmlparser2"."3.7.3";
   by-version."htmlparser2"."3.7.3" = self.buildNodePackage {
     name = "htmlparser2-3.7.3";
+    version = "3.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
@@ -12974,12 +17055,19 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."htmlparser2"."~3.8.1" =
+    self.by-version."htmlparser2"."3.8.2";
   by-spec."http-auth"."2.0.7" =
     self.by-version."http-auth"."2.0.7";
   by-version."http-auth"."2.0.7" = self.buildNodePackage {
     name = "http-auth-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
@@ -12990,12 +17078,17 @@
       "coffee-script-1.6.3" = self.by-version."coffee-script"."1.6.3";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."http-browserify"."^1.4.0" =
+  by-spec."http-browserify"."^1.3.2" =
     self.by-version."http-browserify"."1.7.0";
   by-version."http-browserify"."1.7.0" = self.buildNodePackage {
     name = "http-browserify-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
@@ -13006,12 +17099,19 @@
       "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."http-browserify"."^1.4.0" =
+    self.by-version."http-browserify"."1.7.0";
   by-spec."http-browserify"."~1.1.0" =
     self.by-version."http-browserify"."1.1.0";
   by-version."http-browserify"."1.1.0" = self.buildNodePackage {
     name = "http-browserify-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz";
@@ -13022,12 +17122,17 @@
       "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-errors"."~1.2.8" =
     self.by-version."http-errors"."1.2.8";
   by-version."http-errors"."1.2.8" = self.buildNodePackage {
     name = "http-errors-1.2.8";
+    version = "1.2.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
@@ -13038,12 +17143,17 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-errors"."~1.3.1" =
     self.by-version."http-errors"."1.3.1";
   by-version."http-errors"."1.3.1" = self.buildNodePackage {
     name = "http-errors-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
@@ -13054,12 +17164,17 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-proxy"."1.0.2" =
     self.by-version."http-proxy"."1.0.2";
   by-version."http-proxy"."1.0.2" = self.buildNodePackage {
     name = "http-proxy-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
@@ -13069,12 +17184,17 @@
     deps = {
       "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-proxy"."~0.10" =
     self.by-version."http-proxy"."0.10.4";
   by-version."http-proxy"."0.10.4" = self.buildNodePackage {
     name = "http-proxy-0.10.4";
+    version = "0.10.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz";
@@ -13087,12 +17207,17 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-proxy-agent"."0" =
     self.by-version."http-proxy-agent"."0.2.6";
   by-version."http-proxy-agent"."0.2.6" = self.buildNodePackage {
     name = "http-proxy-agent-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.6.tgz";
@@ -13104,12 +17229,17 @@
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-signature"."0.9.11" =
     self.by-version."http-signature"."0.9.11";
   by-version."http-signature"."0.9.11" = self.buildNodePackage {
     name = "http-signature-0.9.11";
+    version = "0.9.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
@@ -13121,12 +17251,17 @@
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
       "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
   by-version."http-signature"."0.10.1" = self.buildNodePackage {
     name = "http-signature-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
@@ -13138,12 +17273,17 @@
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
       "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."https-browserify"."~0.0.0" =
+  by-spec."https-browserify"."0.0.0" =
     self.by-version."https-browserify"."0.0.0";
   by-version."https-browserify"."0.0.0" = self.buildNodePackage {
     name = "https-browserify-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
@@ -13152,12 +17292,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."https-browserify"."~0.0.0" =
+    self.by-version."https-browserify"."0.0.0";
   by-spec."https-proxy-agent"."0" =
     self.by-version."https-proxy-agent"."0.3.5";
   by-version."https-proxy-agent"."0.3.5" = self.buildNodePackage {
     name = "https-proxy-agent-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.5.tgz";
@@ -13169,12 +17316,17 @@
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."humanize"."~0.0.9" =
     self.by-version."humanize"."0.0.9";
   by-version."humanize"."0.0.9" = self.buildNodePackage {
     name = "humanize-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
@@ -13183,12 +17335,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hyperquest"."^0.3.0" =
+    self.by-version."hyperquest"."0.3.0";
+  by-version."hyperquest"."0.3.0" = self.buildNodePackage {
+    name = "hyperquest-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hyperquest/-/hyperquest-0.3.0.tgz";
+      name = "hyperquest-0.3.0.tgz";
+      sha1 = "4c3c06c074755e921f09a2db51aea5e6e7ee155f";
+    };
+    deps = {
+      "through-2.2.7" = self.by-version."through"."2.2.7";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."i"."0.3.x" =
     self.by-version."i"."0.3.2";
   by-version."i"."0.3.2" = self.buildNodePackage {
     name = "i-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
@@ -13197,12 +17375,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."i18next"."*" =
     self.by-version."i18next"."1.7.10";
   by-version."i18next"."1.7.10" = self.buildNodePackage {
     name = "i18next-1.7.10";
+    version = "1.7.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/i18next/-/i18next-1.7.10.tgz";
@@ -13213,13 +17396,18 @@
       "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
       "json5-0.2.0" = self.by-version."json5"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "i18next" = self.by-version."i18next"."1.7.10";
   by-spec."ibrik"."~2.0.0" =
     self.by-version."ibrik"."2.0.0";
   by-version."ibrik"."2.0.0" = self.buildNodePackage {
     name = "ibrik-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz";
@@ -13229,7 +17417,7 @@
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
-      "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5";
+      "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6";
       "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -13237,12 +17425,17 @@
       "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
       "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."iconv"."~2.1.5" =
+  by-spec."iconv"."~2.1.4" =
     self.by-version."iconv"."2.1.6";
   by-version."iconv"."2.1.6" = self.buildNodePackage {
     name = "iconv-2.1.6";
+    version = "2.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv/-/iconv-2.1.6.tgz";
@@ -13252,12 +17445,19 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iconv"."~2.1.5" =
+    self.by-version."iconv"."2.1.6";
   by-spec."iconv-lite"."0.4.4" =
     self.by-version."iconv-lite"."0.4.4";
   by-version."iconv-lite"."0.4.4" = self.buildNodePackage {
     name = "iconv-lite-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
@@ -13266,12 +17466,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iconv-lite"."0.4.5" =
     self.by-version."iconv-lite"."0.4.5";
   by-version."iconv-lite"."0.4.5" = self.buildNodePackage {
     name = "iconv-lite-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz";
@@ -13280,12 +17485,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iconv-lite"."0.4.6" =
     self.by-version."iconv-lite"."0.4.6";
   by-version."iconv-lite"."0.4.6" = self.buildNodePackage {
     name = "iconv-lite-0.4.6";
+    version = "0.4.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz";
@@ -13294,12 +17504,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iconv-lite"."0.4.7" =
     self.by-version."iconv-lite"."0.4.7";
   by-version."iconv-lite"."0.4.7" = self.buildNodePackage {
     name = "iconv-lite-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz";
@@ -13308,12 +17523,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iconv-lite"."^0.4.4" =
+    self.by-version."iconv-lite"."0.4.7";
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = self.buildNodePackage {
     name = "iconv-lite-0.2.11";
+    version = "0.2.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
@@ -13322,7 +17544,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iconv-lite"."~0.4.4" =
     self.by-version."iconv-lite"."0.4.7";
@@ -13332,6 +17558,7 @@
     self.by-version."ieee754"."1.1.4";
   by-version."ieee754"."1.1.4" = self.buildNodePackage {
     name = "ieee754-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz";
@@ -13340,7 +17567,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ieee754"."~1.1.1" =
     self.by-version."ieee754"."1.1.4";
@@ -13348,6 +17579,7 @@
     self.by-version."image-size"."0.3.5";
   by-version."image-size"."0.3.5" = self.buildNodePackage {
     name = "image-size-0.3.5";
+    version = "0.3.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz";
@@ -13356,12 +17588,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."imagemagick".">=0.1.3" =
     self.by-version."imagemagick"."0.1.3";
   by-version."imagemagick"."0.1.3" = self.buildNodePackage {
     name = "imagemagick-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/imagemagick/-/imagemagick-0.1.3.tgz";
@@ -13370,12 +17607,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."imap"."0.8.14" =
+    self.by-version."imap"."0.8.14";
+  by-version."imap"."0.8.14" = self.buildNodePackage {
+    name = "imap-0.8.14";
+    version = "0.8.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/imap/-/imap-0.8.14.tgz";
+      name = "imap-0.8.14.tgz";
+      sha1 = "d4e6b333163ba0bb5be33cab98e5b19db3e9aa54";
+    };
+    deps = {
+      "utf7-1.0.0" = self.by-version."utf7"."1.0.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."indent-string"."^1.1.0" =
     self.by-version."indent-string"."1.2.1";
   by-version."indent-string"."1.2.1" = self.buildNodePackage {
     name = "indent-string-1.2.1";
+    version = "1.2.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
@@ -13387,12 +17650,17 @@
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "repeating-1.1.2" = self.by-version."repeating"."1.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."indexof"."0.0.1" =
     self.by-version."indexof"."0.0.1";
   by-version."indexof"."0.0.1" = self.buildNodePackage {
     name = "indexof-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
@@ -13401,12 +17669,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."infinity-agent"."^1.0.0" =
     self.by-version."infinity-agent"."1.0.2";
   by-version."infinity-agent"."1.0.2" = self.buildNodePackage {
     name = "infinity-agent-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-1.0.2.tgz";
@@ -13415,12 +17688,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inflection"."~1.3.0" =
     self.by-version."inflection"."1.3.8";
   by-version."inflection"."1.3.8" = self.buildNodePackage {
     name = "inflection-1.3.8";
+    version = "1.3.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz";
@@ -13429,12 +17707,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inflection"."~1.5.3" =
     self.by-version."inflection"."1.5.3";
   by-version."inflection"."1.5.3" = self.buildNodePackage {
     name = "inflection-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inflection/-/inflection-1.5.3.tgz";
@@ -13443,12 +17726,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inflight"."^1.0.4" =
     self.by-version."inflight"."1.0.4";
   by-version."inflight"."1.0.4" = self.buildNodePackage {
     name = "inflight-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
@@ -13459,7 +17747,11 @@
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inflight"."~1.0.1" =
     self.by-version."inflight"."1.0.4";
@@ -13469,6 +17761,7 @@
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = self.buildNodePackage {
     name = "inherits-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
@@ -13477,12 +17770,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = self.buildNodePackage {
     name = "inherits-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
@@ -13491,7 +17789,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."1.x" =
     self.by-version."inherits"."1.0.0";
@@ -13511,6 +17813,7 @@
     self.by-version."ini"."1.3.3";
   by-version."ini"."1.3.3" = self.buildNodePackage {
     name = "ini-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz";
@@ -13519,7 +17822,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ini"."1.x.x" =
     self.by-version."ini"."1.3.3";
@@ -13529,6 +17836,7 @@
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = self.buildNodePackage {
     name = "ini-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
@@ -13537,12 +17845,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ini"."~1.2.0" =
     self.by-version."ini"."1.2.1";
   by-version."ini"."1.2.1" = self.buildNodePackage {
     name = "ini-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
@@ -13551,7 +17864,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ini"."~1.3.0" =
     self.by-version."ini"."1.3.3";
@@ -13561,6 +17878,7 @@
     self.by-version."init-package-json"."1.0.1";
   by-version."init-package-json"."1.0.1" = self.buildNodePackage {
     name = "init-package-json-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.0.1.tgz";
@@ -13574,12 +17892,17 @@
       "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."init-package-json"."~1.2.0" =
     self.by-version."init-package-json"."1.2.0";
   by-version."init-package-json"."1.2.0" = self.buildNodePackage {
     name = "init-package-json-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.2.0.tgz";
@@ -13593,27 +17916,37 @@
       "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inline-source-map"."~0.3.0" =
-    self.by-version."inline-source-map"."0.3.0";
-  by-version."inline-source-map"."0.3.0" = self.buildNodePackage {
-    name = "inline-source-map-0.3.0";
+    self.by-version."inline-source-map"."0.3.1";
+  by-version."inline-source-map"."0.3.1" = self.buildNodePackage {
+    name = "inline-source-map-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz";
-      name = "inline-source-map-0.3.0.tgz";
-      sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a";
+      url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz";
+      name = "inline-source-map-0.3.1.tgz";
+      sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
     };
     deps = {
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inquirer"."0.7.1" =
     self.by-version."inquirer"."0.7.1";
   by-version."inquirer"."0.7.1" = self.buildNodePackage {
     name = "inquirer-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz";
@@ -13627,15 +17960,20 @@
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.3.25" = self.by-version."rx"."2.3.25";
+      "rx-2.4.0" = self.by-version."rx"."2.4.0";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inquirer".">=0.2.4" =
     self.by-version."inquirer"."0.8.0";
   by-version."inquirer"."0.8.0" = self.buildNodePackage {
     name = "inquirer-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.0.tgz";
@@ -13643,22 +17981,27 @@
       sha1 = "525d4dd827d4f3d506b453726068f90deb99b443";
     };
     deps = {
-      "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0";
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
       "figures-1.3.5" = self.by-version."figures"."1.3.5";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.3.25" = self.by-version."rx"."2.3.25";
+      "rx-2.4.0" = self.by-version."rx"."2.4.0";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inquirer"."^0.6.0" =
     self.by-version."inquirer"."0.6.0";
   by-version."inquirer"."0.6.0" = self.buildNodePackage {
     name = "inquirer-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz";
@@ -13671,15 +18014,20 @@
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.3.25" = self.by-version."rx"."2.3.25";
+      "rx-2.4.0" = self.by-version."rx"."2.4.0";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."insert-module-globals"."^6.1.0" =
     self.by-version."insert-module-globals"."6.2.0";
   by-version."insert-module-globals"."6.2.0" = self.buildNodePackage {
     name = "insert-module-globals-6.2.0";
+    version = "6.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.0.tgz";
@@ -13695,7 +18043,11 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."insert-module-globals"."^6.2.0" =
     self.by-version."insert-module-globals"."6.2.0";
@@ -13703,6 +18055,7 @@
     self.by-version."insert-module-globals"."2.3.4";
   by-version."insert-module-globals"."2.3.4" = self.buildNodePackage {
     name = "insert-module-globals-2.3.4";
+    version = "2.3.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz";
@@ -13720,12 +18073,17 @@
       "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17";
       "browserify-3.24.13" = self.by-version."browserify"."3.24.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."insert-module-globals"."~3.1.2" =
     self.by-version."insert-module-globals"."3.1.3";
   by-version."insert-module-globals"."3.1.3" = self.buildNodePackage {
     name = "insert-module-globals-3.1.3";
+    version = "3.1.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz";
@@ -13739,12 +18097,17 @@
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."insight"."0.4.3" =
     self.by-version."insight"."0.4.3";
   by-version."insight"."0.4.3" = self.buildNodePackage {
     name = "insight-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz";
@@ -13762,12 +18125,17 @@
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."install"."~0.1.7" =
     self.by-version."install"."0.1.8";
   by-version."install"."0.1.8" = self.buildNodePackage {
     name = "install-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/install/-/install-0.1.8.tgz";
@@ -13776,12 +18144,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."internal-ip"."^1.0.0" =
     self.by-version."internal-ip"."1.0.0";
   by-version."internal-ip"."1.0.0" = self.buildNodePackage {
     name = "internal-ip-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/internal-ip/-/internal-ip-1.0.0.tgz";
@@ -13790,12 +18163,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."interpret"."^0.3.2" =
     self.by-version."interpret"."0.3.10";
   by-version."interpret"."0.3.10" = self.buildNodePackage {
     name = "interpret-0.3.10";
+    version = "0.3.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz";
@@ -13804,12 +18182,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
   by-version."intersect"."0.0.3" = self.buildNodePackage {
     name = "intersect-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
@@ -13818,12 +18201,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ip"."^0.3.0" =
     self.by-version."ip"."0.3.2";
   by-version."ip"."0.3.2" = self.buildNodePackage {
     name = "ip-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz";
@@ -13832,12 +18220,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
     name = "ip-regex-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz";
@@ -13846,12 +18239,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ip-set"."^1.0.0" =
     self.by-version."ip-set"."1.0.0";
   by-version."ip-set"."1.0.0" = self.buildNodePackage {
     name = "ip-set-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz";
@@ -13861,12 +18259,17 @@
     deps = {
       "ip-0.3.2" = self.by-version."ip"."0.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ipaddr.js"."0.1.2" =
     self.by-version."ipaddr.js"."0.1.2";
   by-version."ipaddr.js"."0.1.2" = self.buildNodePackage {
     name = "ipaddr.js-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
@@ -13875,12 +18278,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ipaddr.js"."0.1.8" =
     self.by-version."ipaddr.js"."0.1.8";
   by-version."ipaddr.js"."0.1.8" = self.buildNodePackage {
     name = "ipaddr.js-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.8.tgz";
@@ -13889,7 +18297,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.1" =
     self.by-version."ipaddr.js"."0.1.8";
@@ -13899,10 +18311,54 @@
     self.by-version."ipaddr.js"."0.1.8";
   by-spec."ipaddr.js"."^0.1.5" =
     self.by-version."ipaddr.js"."0.1.8";
+  by-spec."irc"."0.3.9" =
+    self.by-version."irc"."0.3.9";
+  by-version."irc"."0.3.9" = self.buildNodePackage {
+    name = "irc-0.3.9";
+    version = "0.3.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/irc/-/irc-0.3.9.tgz";
+      name = "irc-0.3.9.tgz";
+      sha1 = "9c0d846379dbc306b38de5d08cf354f4fc6c83d9";
+    };
+    deps = {
+      "ansi-color-0.2.1" = self.by-version."ansi-color"."0.2.1";
+      "irc-colors-1.1.0" = self.by-version."irc-colors"."1.1.0";
+    };
+    optionalDependencies = {
+      "iconv-2.1.6" = self.by-version."iconv"."2.1.6";
+      "node-icu-charset-detector-0.0.7" = self.by-version."node-icu-charset-detector"."0.0.7";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."irc-colors"."^1.1.0" =
+    self.by-version."irc-colors"."1.1.0";
+  by-version."irc-colors"."1.1.0" = self.buildNodePackage {
+    name = "irc-colors-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/irc-colors/-/irc-colors-1.1.0.tgz";
+      name = "irc-colors-1.1.0.tgz";
+      sha1 = "f92f184c136e8893ad3fe55d130ed409b0dc0745";
+    };
+    deps = {
+      "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ironhorse"."*" =
     self.by-version."ironhorse"."0.0.10";
   by-version."ironhorse"."0.0.10" = self.buildNodePackage {
     name = "ironhorse-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
@@ -13919,7 +18375,7 @@
       "jade-1.9.2" = self.by-version."jade"."1.9.2";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2";
-      "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6";
+      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
       "mongoose-3.8.23" = self.by-version."mongoose"."3.8.23";
       "gridfs-stream-1.0.1" = self.by-version."gridfs-stream"."1.0.1";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
@@ -13927,13 +18383,18 @@
       "redis-0.12.1" = self.by-version."redis"."0.12.1";
       "hiredis-0.2.0" = self.by-version."hiredis"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.10";
   by-spec."is-array"."^1.0.1" =
     self.by-version."is-array"."1.0.1";
   by-version."is-array"."1.0.1" = self.buildNodePackage {
     name = "is-array-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz";
@@ -13942,12 +18403,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-binary-path"."^1.0.0" =
     self.by-version."is-binary-path"."1.0.0";
   by-version."is-binary-path"."1.0.0" = self.buildNodePackage {
     name = "is-binary-path-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.0.tgz";
@@ -13957,12 +18423,17 @@
     deps = {
       "binary-extensions-1.3.0" = self.by-version."binary-extensions"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-finite"."^1.0.0" =
     self.by-version."is-finite"."1.0.0";
   by-version."is-finite"."1.0.0" = self.buildNodePackage {
     name = "is-finite-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz";
@@ -13971,12 +18442,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-glob"."^0.3.0" =
     self.by-version."is-glob"."0.3.0";
   by-version."is-glob"."0.3.0" = self.buildNodePackage {
     name = "is-glob-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-glob/-/is-glob-0.3.0.tgz";
@@ -13985,12 +18461,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-ip"."^1.0.0" =
     self.by-version."is-ip"."1.0.0";
   by-version."is-ip"."1.0.0" = self.buildNodePackage {
     name = "is-ip-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
@@ -14000,12 +18481,17 @@
     deps = {
       "ip-regex-1.0.3" = self.by-version."ip-regex"."1.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-npm"."^1.0.0" =
     self.by-version."is-npm"."1.0.0";
   by-version."is-npm"."1.0.0" = self.buildNodePackage {
     name = "is-npm-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
@@ -14014,12 +18500,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.1";
   by-version."is-promise"."1.0.1" = self.buildNodePackage {
     name = "is-promise-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
@@ -14028,12 +18519,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-root"."~1.0.0" =
     self.by-version."is-root"."1.0.0";
   by-version."is-root"."1.0.0" = self.buildNodePackage {
     name = "is-root-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
@@ -14042,12 +18538,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."is-stream"."^1.0.0" =
     self.by-version."is-stream"."1.0.1";
   by-version."is-stream"."1.0.1" = self.buildNodePackage {
     name = "is-stream-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz";
@@ -14056,12 +18557,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."is-utf8"."^0.2.0" =
+  by-spec."is-utf8"."0.2.0" =
     self.by-version."is-utf8"."0.2.0";
   by-version."is-utf8"."0.2.0" = self.buildNodePackage {
     name = "is-utf8-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
@@ -14070,12 +18576,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."is-utf8"."^0.2.0" =
+    self.by-version."is-utf8"."0.2.0";
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = self.buildNodePackage {
     name = "isarray-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
@@ -14084,7 +18597,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."isarray"."~0.0.1" =
     self.by-version."isarray"."0.0.1";
@@ -14092,6 +18609,7 @@
     self.by-version."isstream"."0.1.1";
   by-version."isstream"."0.1.1" = self.buildNodePackage {
     name = "isstream-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
@@ -14100,22 +18618,27 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."isstream"."~0.1.1" =
     self.by-version."isstream"."0.1.1";
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.3.5";
-  by-version."istanbul"."0.3.5" = self.buildNodePackage {
-    name = "istanbul-0.3.5";
+    self.by-version."istanbul"."0.3.6";
+  by-version."istanbul"."0.3.6" = self.buildNodePackage {
+    name = "istanbul-0.3.6";
+    version = "0.3.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
-      name = "istanbul-0.3.5.tgz";
-      sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37";
+      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.6.tgz";
+      name = "istanbul-0.3.6.tgz";
+      sha1 = "e63ffc1d61de2f6344a899f80abdc0ef6491b17b";
     };
     deps = {
-      "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
+      "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
       "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
       "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -14123,23 +18646,29 @@
       "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
       "which-1.0.8" = self.by-version."which"."1.0.8";
       "async-0.9.0" = self.by-version."async"."0.9.0";
+      "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1";
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
-      "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6";
+      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "istanbul" = self.by-version."istanbul"."0.3.5";
+  "istanbul" = self.by-version."istanbul"."0.3.6";
   by-spec."istanbul"."~0.3.0" =
-    self.by-version."istanbul"."0.3.5";
+    self.by-version."istanbul"."0.3.6";
   by-spec."istanbul"."~0.3.2" =
-    self.by-version."istanbul"."0.3.5";
+    self.by-version."istanbul"."0.3.6";
   by-spec."jade"."*" =
     self.by-version."jade"."1.9.2";
   by-version."jade"."1.9.2" = self.buildNodePackage {
     name = "jade-1.9.2";
+    version = "1.9.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jade/-/jade-1.9.2.tgz";
@@ -14155,13 +18684,18 @@
       "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
       "with-4.0.1" = self.by-version."with"."4.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "jade" = self.by-version."jade"."1.9.2";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = self.buildNodePackage {
     name = "jade-0.26.3";
+    version = "0.26.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
@@ -14172,12 +18706,17 @@
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jade"."0.27.0" =
     self.by-version."jade"."0.27.0";
   by-version."jade"."0.27.0" = self.buildNodePackage {
     name = "jade-0.27.0";
+    version = "0.27.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
@@ -14188,12 +18727,17 @@
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jade"."1.1.5" =
     self.by-version."jade"."1.1.5";
   by-version."jade"."1.1.5" = self.buildNodePackage {
     name = "jade-1.1.5";
+    version = "1.1.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
@@ -14209,7 +18753,11 @@
       "with-2.0.0" = self.by-version."with"."2.0.0";
       "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jade".">= 0.0.1" =
     self.by-version."jade"."1.9.2";
@@ -14217,6 +18765,7 @@
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = self.buildNodePackage {
     name = "jade-0.35.0";
+    version = "0.35.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
@@ -14232,12 +18781,17 @@
       "with-1.1.1" = self.by-version."with"."1.1.1";
       "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jayschema"."*" =
     self.by-version."jayschema"."0.3.1";
   by-version."jayschema"."0.3.1" = self.buildNodePackage {
     name = "jayschema-0.3.1";
+    version = "0.3.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
@@ -14247,13 +18801,18 @@
     deps = {
       "when-3.4.6" = self.by-version."when"."3.4.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "jayschema" = self.by-version."jayschema"."0.3.1";
   by-spec."jfs"."*" =
     self.by-version."jfs"."0.2.5";
   by-version."jfs"."0.2.5" = self.buildNodePackage {
     name = "jfs-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jfs/-/jfs-0.2.5.tgz";
@@ -14266,13 +18825,18 @@
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "clone-0.2.0" = self.by-version."clone"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "jfs" = self.by-version."jfs"."0.2.5";
   by-spec."js-string-escape"."^1.0.0" =
     self.by-version."js-string-escape"."1.0.0";
   by-version."js-string-escape"."1.0.0" = self.buildNodePackage {
     name = "js-string-escape-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.0.tgz";
@@ -14281,29 +18845,39 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."js-yaml"."*" =
-    self.by-version."js-yaml"."3.2.6";
-  by-version."js-yaml"."3.2.6" = self.buildNodePackage {
-    name = "js-yaml-3.2.6";
+    self.by-version."js-yaml"."3.2.7";
+  by-version."js-yaml"."3.2.7" = self.buildNodePackage {
+    name = "js-yaml-3.2.7";
+    version = "3.2.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.6.tgz";
-      name = "js-yaml-3.2.6.tgz";
-      sha1 = "dde1ffbe2726e3fff97efb65fd02dbd6647b8309";
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
+      name = "js-yaml-3.2.7.tgz";
+      sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec";
     };
     deps = {
-      "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+      "argparse-1.0.1" = self.by-version."argparse"."1.0.1";
+      "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "js-yaml" = self.by-version."js-yaml"."3.2.6";
+  "js-yaml" = self.by-version."js-yaml"."3.2.7";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = self.buildNodePackage {
     name = "js-yaml-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
@@ -14312,12 +18886,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."js-yaml"."2.1.0" =
     self.by-version."js-yaml"."2.1.0";
   by-version."js-yaml"."2.1.0" = self.buildNodePackage {
     name = "js-yaml-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
@@ -14328,12 +18907,17 @@
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."js-yaml"."3.0.1" =
     self.by-version."js-yaml"."3.0.1";
   by-version."js-yaml"."3.0.1" = self.buildNodePackage {
     name = "js-yaml-3.0.1";
+    version = "3.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
@@ -14344,16 +18928,21 @@
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."js-yaml"."3.x" =
-    self.by-version."js-yaml"."3.2.6";
+    self.by-version."js-yaml"."3.2.7";
   by-spec."js-yaml"."^3.1.0" =
-    self.by-version."js-yaml"."3.2.6";
+    self.by-version."js-yaml"."3.2.7";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
   by-version."js-yaml"."2.0.5" = self.buildNodePackage {
     name = "js-yaml-2.0.5";
+    version = "2.0.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
@@ -14364,12 +18953,17 @@
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsdom"."^0.10.5" =
     self.by-version."jsdom"."0.10.6";
   by-version."jsdom"."0.10.6" = self.buildNodePackage {
     name = "jsdom-0.10.6";
+    version = "0.10.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsdom/-/jsdom-0.10.6.tgz";
@@ -14385,12 +18979,17 @@
       "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsdom"."^0.11.0" =
     self.by-version."jsdom"."0.11.1";
   by-version."jsdom"."0.11.1" = self.buildNodePackage {
     name = "jsdom-0.11.1";
+    version = "0.11.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
@@ -14406,12 +19005,17 @@
       "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsdom"."~0.8.6" =
     self.by-version."jsdom"."0.8.11";
   by-version."jsdom"."0.8.11" = self.buildNodePackage {
     name = "jsdom-0.8.11";
+    version = "0.8.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsdom/-/jsdom-0.8.11.tgz";
@@ -14427,12 +19031,17 @@
       "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-version."jsesc"."0.4.3" = self.buildNodePackage {
     name = "jsesc-0.4.3";
+    version = "0.4.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
@@ -14441,7 +19050,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
@@ -14449,6 +19062,7 @@
     self.by-version."jshint"."2.6.0";
   by-version."jshint"."2.6.0" = self.buildNodePackage {
     name = "jshint-2.6.0";
+    version = "2.6.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jshint/-/jshint-2.6.0.tgz";
@@ -14465,7 +19079,11 @@
       "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2";
       "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "jshint" = self.by-version."jshint"."2.6.0";
   by-spec."jshint"."~2.6.0" =
@@ -14474,6 +19092,7 @@
     self.by-version."json"."9.0.3";
   by-version."json"."9.0.3" = self.buildNodePackage {
     name = "json-9.0.3";
+    version = "9.0.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/json/-/json-9.0.3.tgz";
@@ -14482,13 +19101,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "json" = self.by-version."json"."9.0.3";
   by-spec."json-middleware"."^1.0.2" =
     self.by-version."json-middleware"."1.0.2";
   by-version."json-middleware"."1.0.2" = self.buildNodePackage {
     name = "json-middleware-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-middleware/-/json-middleware-1.0.2.tgz";
@@ -14497,12 +19121,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = self.buildNodePackage {
     name = "json-schema-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
@@ -14511,12 +19140,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json-stable-stringify"."~0.0.0" =
     self.by-version."json-stable-stringify"."0.0.1";
   by-version."json-stable-stringify"."0.0.1" = self.buildNodePackage {
     name = "json-stable-stringify-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
@@ -14526,12 +19160,17 @@
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json-stringify-safe"."~3.0.0" =
     self.by-version."json-stringify-safe"."3.0.0";
   by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage {
     name = "json-stringify-safe-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
@@ -14540,12 +19179,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
   by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
     name = "json-stringify-safe-5.0.0";
+    version = "5.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
@@ -14554,12 +19198,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json3"."3.2.6" =
     self.by-version."json3"."3.2.6";
   by-version."json3"."3.2.6" = self.buildNodePackage {
     name = "json3-3.2.6";
+    version = "3.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
@@ -14568,12 +19217,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."json5"."^0.2.0" =
     self.by-version."json5"."0.2.0";
   by-version."json5"."0.2.0" = self.buildNodePackage {
     name = "json5-0.2.0";
+    version = "0.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
@@ -14582,12 +19236,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonfile"."^2.0.0" =
     self.by-version."jsonfile"."2.0.0";
   by-version."jsonfile"."2.0.0" = self.buildNodePackage {
     name = "jsonfile-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
@@ -14596,12 +19255,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonfile"."~1.0.1" =
     self.by-version."jsonfile"."1.0.1";
   by-version."jsonfile"."1.0.1" = self.buildNodePackage {
     name = "jsonfile-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
@@ -14610,12 +19274,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonfile"."~1.1.0" =
     self.by-version."jsonfile"."1.1.1";
   by-version."jsonfile"."1.1.1" = self.buildNodePackage {
     name = "jsonfile-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz";
@@ -14624,12 +19293,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonify"."~0.0.0" =
     self.by-version."jsonify"."0.0.0";
   by-version."jsonify"."0.0.0" = self.buildNodePackage {
     name = "jsonify-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
@@ -14638,12 +19312,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonparse"."0.0.5" =
     self.by-version."jsonparse"."0.0.5";
   by-version."jsonparse"."0.0.5" = self.buildNodePackage {
     name = "jsonparse-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
@@ -14652,12 +19331,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsontool"."*" =
     self.by-version."jsontool"."7.0.2";
   by-version."jsontool"."7.0.2" = self.buildNodePackage {
     name = "jsontool-7.0.2";
+    version = "7.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
@@ -14666,13 +19350,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "jsontool" = self.by-version."jsontool"."7.0.2";
   by-spec."jsonwebtoken"."^1.1.1" =
     self.by-version."jsonwebtoken"."1.3.0";
   by-version."jsonwebtoken"."1.3.0" = self.buildNodePackage {
     name = "jsonwebtoken-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-1.3.0.tgz";
@@ -14682,12 +19371,17 @@
     deps = {
       "jws-0.2.6" = self.by-version."jws"."0.2.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsprim"."0.3.0" =
     self.by-version."jsprim"."0.3.0";
   by-version."jsprim"."0.3.0" = self.buildNodePackage {
     name = "jsprim-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
@@ -14699,12 +19393,17 @@
       "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
       "verror-1.3.3" = self.by-version."verror"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jstransform"."^7.0.0" =
     self.by-version."jstransform"."7.0.0";
   by-version."jstransform"."7.0.0" = self.buildNodePackage {
     name = "jstransform-7.0.0";
+    version = "7.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz";
@@ -14716,43 +19415,58 @@
       "esprima-fb-7001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
       "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."jstransform"."^9.1.0" =
-    self.by-version."jstransform"."9.1.0";
-  by-version."jstransform"."9.1.0" = self.buildNodePackage {
-    name = "jstransform-9.1.0";
+  by-spec."jstransform"."^9.1.1" =
+    self.by-version."jstransform"."9.1.1";
+  by-version."jstransform"."9.1.1" = self.buildNodePackage {
+    name = "jstransform-9.1.1";
+    version = "9.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.0.tgz";
-      name = "jstransform-9.1.0.tgz";
-      sha1 = "7b3903a1ba4aab972daa0540a4131c5386ad90dd";
+      url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.1.tgz";
+      name = "jstransform-9.1.1.tgz";
+      sha1 = "2085ae83ac4e28d5f247c56bf6e43404a85c4b14";
     };
     deps = {
       "base62-0.1.1" = self.by-version."base62"."0.1.1";
       "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
       "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."junk"."~1.0.0" =
-    self.by-version."junk"."1.0.0";
-  by-version."junk"."1.0.0" = self.buildNodePackage {
-    name = "junk-1.0.0";
+    self.by-version."junk"."1.0.1";
+  by-version."junk"."1.0.1" = self.buildNodePackage {
+    name = "junk-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/junk/-/junk-1.0.0.tgz";
-      name = "junk-1.0.0.tgz";
-      sha1 = "22b05ee710f40c44f82fb260602ffecd489223b8";
+      url = "http://registry.npmjs.org/junk/-/junk-1.0.1.tgz";
+      name = "junk-1.0.1.tgz";
+      sha1 = "824ef8925f02026f61bc6e6fa346b25fa8f3938b";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jwa"."0.0.1" =
     self.by-version."jwa"."0.0.1";
   by-version."jwa"."0.0.1" = self.buildNodePackage {
     name = "jwa-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jwa/-/jwa-0.0.1.tgz";
@@ -14762,12 +19476,17 @@
     deps = {
       "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jws"."0.0.2" =
     self.by-version."jws"."0.0.2";
   by-version."jws"."0.0.2" = self.buildNodePackage {
     name = "jws-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
@@ -14778,12 +19497,17 @@
       "tap-0.3.3" = self.by-version."tap"."0.3.3";
       "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jws"."~0.2.6" =
     self.by-version."jws"."0.2.6";
   by-version."jws"."0.2.6" = self.buildNodePackage {
     name = "jws-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jws/-/jws-0.2.6.tgz";
@@ -14794,12 +19518,17 @@
       "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
       "jwa-0.0.1" = self.by-version."jwa"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jwt-simple"."0.1.x" =
     self.by-version."jwt-simple"."0.1.0";
   by-version."jwt-simple"."0.1.0" = self.buildNodePackage {
     name = "jwt-simple-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz";
@@ -14808,12 +19537,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."k-bucket"."^0.4.2" =
     self.by-version."k-bucket"."0.4.2";
   by-version."k-bucket"."0.4.2" = self.buildNodePackage {
     name = "k-bucket-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz";
@@ -14823,12 +19557,17 @@
     deps = {
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kareem"."0.0.4" =
     self.by-version."kareem"."0.0.4";
   by-version."kareem"."0.0.4" = self.buildNodePackage {
     name = "kareem-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kareem/-/kareem-0.0.4.tgz";
@@ -14837,12 +19576,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."karma"."*" =
     self.by-version."karma"."0.12.31";
   by-version."karma"."0.12.31" = self.buildNodePackage {
     name = "karma-0.12.31";
+    version = "0.12.31";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma/-/karma-0.12.31.tgz";
@@ -14852,7 +19596,7 @@
     deps = {
       "di-0.0.1" = self.by-version."di"."0.0.1";
       "socket.io-0.9.16" = self.by-version."socket.io"."0.9.16";
-      "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3";
+      "chokidar-0.12.6" = self.by-version."chokidar"."0.12.6";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4";
@@ -14868,7 +19612,11 @@
       "connect-2.26.6" = self.by-version."connect"."2.26.6";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "karma" = self.by-version."karma"."0.12.31";
   by-spec."karma".">=0.11.11" =
@@ -14885,6 +19633,7 @@
     self.by-version."karma-chrome-launcher"."0.1.7";
   by-version."karma-chrome-launcher"."0.1.7" = self.buildNodePackage {
     name = "karma-chrome-launcher-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz";
@@ -14893,14 +19642,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7";
   by-spec."karma-coverage"."*" =
     self.by-version."karma-coverage"."0.2.7";
   by-version."karma-coverage"."0.2.7" = self.buildNodePackage {
     name = "karma-coverage-0.2.7";
+    version = "0.2.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz";
@@ -14908,19 +19662,24 @@
       sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576";
     };
     deps = {
-      "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5";
+      "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6";
       "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0";
       "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11";
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-coverage" = self.by-version."karma-coverage"."0.2.7";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.2";
   by-version."karma-junit-reporter"."0.2.2" = self.buildNodePackage {
     name = "karma-junit-reporter-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
@@ -14930,14 +19689,19 @@
     deps = {
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
     self.by-version."karma-mocha"."0.1.10";
   by-version."karma-mocha"."0.1.10" = self.buildNodePackage {
     name = "karma-mocha-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz";
@@ -14946,15 +19710,20 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"
       self.by-version."mocha"."2.1.0"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-mocha" = self.by-version."karma-mocha"."0.1.10";
   by-spec."karma-requirejs"."*" =
     self.by-version."karma-requirejs"."0.2.2";
   by-version."karma-requirejs"."0.2.2" = self.buildNodePackage {
     name = "karma-requirejs-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
@@ -14963,15 +19732,20 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"
       self.by-version."requirejs"."2.1.16"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
   by-spec."karma-sauce-launcher"."*" =
     self.by-version."karma-sauce-launcher"."0.2.10";
   by-version."karma-sauce-launcher"."0.2.10" = self.buildNodePackage {
     name = "karma-sauce-launcher-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
@@ -14984,14 +19758,19 @@
       "q-0.9.7" = self.by-version."q"."0.9.7";
       "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."karma"."0.12.31"];
+    os = [ ];
+    cpu = [ ];
   };
   "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10";
   by-spec."keen.io"."^0.1.2" =
     self.by-version."keen.io"."0.1.3";
   by-version."keen.io"."0.1.3" = self.buildNodePackage {
     name = "keen.io-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
@@ -15002,7 +19781,11 @@
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keen.io"."~0.1.3" =
     self.by-version."keen.io"."0.1.3";
@@ -15010,6 +19793,7 @@
     self.by-version."keep-alive-agent"."0.0.1";
   by-version."keep-alive-agent"."0.0.1" = self.buildNodePackage {
     name = "keep-alive-agent-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
@@ -15018,12 +19802,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kerberos"."0.0.3" =
     self.by-version."kerberos"."0.0.3";
   by-version."kerberos"."0.0.3" = self.buildNodePackage {
     name = "kerberos-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
@@ -15032,12 +19821,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kerberos"."0.0.4" =
     self.by-version."kerberos"."0.0.4";
   by-version."kerberos"."0.0.4" = self.buildNodePackage {
     name = "kerberos-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz";
@@ -15046,12 +19840,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kerberos"."0.0.7" =
     self.by-version."kerberos"."0.0.7";
   by-version."kerberos"."0.0.7" = self.buildNodePackage {
     name = "kerberos-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz";
@@ -15061,12 +19860,17 @@
     deps = {
       "nan-1.3.0" = self.by-version."nan"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kerberos"."0.0.9" =
     self.by-version."kerberos"."0.0.9";
   by-version."kerberos"."0.0.9" = self.buildNodePackage {
     name = "kerberos-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz";
@@ -15076,12 +19880,17 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kew"."0.4.0" =
     self.by-version."kew"."0.4.0";
   by-version."kew"."0.4.0" = self.buildNodePackage {
     name = "kew-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz";
@@ -15090,12 +19899,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."kew"."~0.1.7" =
     self.by-version."kew"."0.1.7";
   by-version."kew"."0.1.7" = self.buildNodePackage {
     name = "kew-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
@@ -15104,12 +19918,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keygrip"."0.2.x" =
     self.by-version."keygrip"."0.2.4";
   by-version."keygrip"."0.2.4" = self.buildNodePackage {
     name = "keygrip-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keygrip/-/keygrip-0.2.4.tgz";
@@ -15118,12 +19937,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keygrip"."~1.0.0" =
     self.by-version."keygrip"."1.0.1";
   by-version."keygrip"."1.0.1" = self.buildNodePackage {
     name = "keygrip-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
@@ -15132,12 +19956,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keypress"."0.1.x" =
     self.by-version."keypress"."0.1.0";
   by-version."keypress"."0.1.0" = self.buildNodePackage {
     name = "keypress-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
@@ -15146,12 +19975,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keypress"."^0.2.1" =
     self.by-version."keypress"."0.2.1";
   by-version."keypress"."0.2.1" = self.buildNodePackage {
     name = "keypress-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
@@ -15160,7 +19994,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keypress"."~0.2.1" =
     self.by-version."keypress"."0.2.1";
@@ -15168,6 +20006,7 @@
     self.by-version."kibana-authentication-proxy"."1.1.0";
   by-version."kibana-authentication-proxy"."1.1.0" = self.buildNodePackage {
     name = "kibana-authentication-proxy-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchgit {
       url = "git://github.com/fangli/kibana-authentication-proxy";
@@ -15175,19 +20014,24 @@
       sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f";
     };
     deps = {
-      "express-3.19.2" = self.by-version."express"."3.19.2";
+      "express-3.20.0" = self.by-version."express"."3.20.0";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
       "connect-restreamer-1.0.1" = self.by-version."connect-restreamer"."1.0.1";
       "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "kibana-authentication-proxy" = self.by-version."kibana-authentication-proxy"."1.1.0";
   by-spec."knockout"."~3.2.0" =
     self.by-version."knockout"."3.2.0";
   by-version."knockout"."3.2.0" = self.buildNodePackage {
     name = "knockout-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz";
@@ -15196,12 +20040,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."knox"."*" =
     self.by-version."knox"."0.9.2";
   by-version."knox"."0.9.2" = self.buildNodePackage {
     name = "knox-0.9.2";
+    version = "0.9.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/knox/-/knox-0.9.2.tgz";
@@ -15215,13 +20064,18 @@
       "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "knox" = self.by-version."knox"."0.9.2";
   by-spec."kue"."*" =
     self.by-version."kue"."0.8.11";
   by-version."kue"."0.8.11" = self.buildNodePackage {
     name = "kue-0.8.11";
+    version = "0.8.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz";
@@ -15238,13 +20092,18 @@
       "nib-0.5.0" = self.by-version."nib"."0.5.0";
       "reds-0.2.5" = self.by-version."reds"."0.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "kue" = self.by-version."kue"."0.8.11";
   by-spec."labeled-stream-splicer"."^1.0.0" =
     self.by-version."labeled-stream-splicer"."1.0.2";
   by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage {
     name = "labeled-stream-splicer-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
@@ -15256,12 +20115,17 @@
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "stream-splicer-1.3.1" = self.by-version."stream-splicer"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."latest-version"."^0.2.0" =
     self.by-version."latest-version"."0.2.0";
   by-version."latest-version"."0.2.0" = self.buildNodePackage {
     name = "latest-version-0.2.0";
+    version = "0.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz";
@@ -15271,12 +20135,17 @@
     deps = {
       "package-json-0.2.0" = self.by-version."package-json"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."latest-version"."^1.0.0" =
     self.by-version."latest-version"."1.0.0";
   by-version."latest-version"."1.0.0" = self.buildNodePackage {
     name = "latest-version-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz";
@@ -15284,14 +20153,19 @@
       sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9";
     };
     deps = {
-      "package-json-1.0.2" = self.by-version."package-json"."1.0.2";
+      "package-json-1.1.0" = self.by-version."package-json"."1.1.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = self.buildNodePackage {
     name = "lazy-1.0.11";
+    version = "1.0.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
@@ -15300,12 +20174,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lazystream"."~0.1.0" =
     self.by-version."lazystream"."0.1.0";
   by-version."lazystream"."0.1.0" = self.buildNodePackage {
     name = "lazystream-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
@@ -15315,12 +20194,17 @@
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lcov-parse"."0.0.6" =
     self.by-version."lcov-parse"."0.0.6";
   by-version."lcov-parse"."0.0.6" = self.buildNodePackage {
     name = "lcov-parse-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
@@ -15329,12 +20213,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lcov-result-merger"."*" =
     self.by-version."lcov-result-merger"."1.0.2";
   by-version."lcov-result-merger"."1.0.2" = self.buildNodePackage {
     name = "lcov-result-merger-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz";
@@ -15346,13 +20235,18 @@
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.2";
   by-spec."ldapjs"."^0.7.1" =
     self.by-version."ldapjs"."0.7.1";
   by-version."ldapjs"."0.7.1" = self.buildNodePackage {
     name = "ldapjs-0.7.1";
+    version = "0.7.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz";
@@ -15365,14 +20259,19 @@
       "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1";
       "nopt-2.1.1" = self.by-version."nopt"."2.1.1";
       "pooling-0.4.6" = self.by-version."pooling"."0.4.6";
+    };
+    optionalDependencies = {
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."less"."*" =
     self.by-version."less"."2.4.0";
   by-version."less"."2.4.0" = self.buildNodePackage {
     name = "less-2.4.0";
+    version = "2.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/less/-/less-2.4.0.tgz";
@@ -15380,6 +20279,8 @@
       sha1 = "ce51b38f1c05a0cdd47982fac40dd0a39cec2031";
     };
     deps = {
+    };
+    optionalDependencies = {
       "errno-0.1.1" = self.by-version."errno"."0.1.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
@@ -15390,6 +20291,8 @@
       "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "less" = self.by-version."less"."2.4.0";
   by-spec."less"."^2.1.0" =
@@ -15398,6 +20301,7 @@
     self.by-version."levn"."0.2.5";
   by-version."levn"."0.2.5" = self.buildNodePackage {
     name = "levn-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
@@ -15408,12 +20312,17 @@
       "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
       "type-check-0.3.1" = self.by-version."type-check"."0.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lexical-scope"."~0.0.14" =
     self.by-version."lexical-scope"."0.0.15";
   by-version."lexical-scope"."0.0.15" = self.buildNodePackage {
     name = "lexical-scope-0.0.15";
+    version = "0.0.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz";
@@ -15423,12 +20332,17 @@
     deps = {
       "astw-0.0.0" = self.by-version."astw"."0.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lexical-scope"."~0.1.0" =
     self.by-version."lexical-scope"."0.1.0";
   by-version."lexical-scope"."0.1.0" = self.buildNodePackage {
     name = "lexical-scope-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
@@ -15438,12 +20352,17 @@
     deps = {
       "astw-0.1.0" = self.by-version."astw"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lexical-scope"."~1.1.0" =
     self.by-version."lexical-scope"."1.1.0";
   by-version."lexical-scope"."1.1.0" = self.buildNodePackage {
     name = "lexical-scope-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
@@ -15453,12 +20372,79 @@
     deps = {
       "astw-1.1.0" = self.by-version."astw"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libbase64"."^0.1.0" =
+    self.by-version."libbase64"."0.1.0";
+  by-version."libbase64"."0.1.0" = self.buildNodePackage {
+    name = "libbase64-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz";
+      name = "libbase64-0.1.0.tgz";
+      sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libmime"."^0.1.3" =
+    self.by-version."libmime"."0.1.7";
+  by-version."libmime"."0.1.7" = self.buildNodePackage {
+    name = "libmime-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libmime/-/libmime-0.1.7.tgz";
+      name = "libmime-0.1.7.tgz";
+      sha1 = "827b8d4df349e08c6cff1bc6d6b51ec57d349cb2";
+    };
+    deps = {
+      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
+      "libqp-0.1.1" = self.by-version."libqp"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libmime"."^0.1.5" =
+    self.by-version."libmime"."0.1.7";
+  by-spec."libqp"."^0.1.1" =
+    self.by-version."libqp"."0.1.1";
+  by-version."libqp"."0.1.1" = self.buildNodePackage {
+    name = "libqp-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libqp/-/libqp-0.1.1.tgz";
+      name = "libqp-0.1.1.tgz";
+      sha1 = "2d10cabb96b14fe9649f4ae353a39baa90063b01";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."libxmljs"."~0.10.0" =
     self.by-version."libxmljs"."0.10.0";
   by-version."libxmljs"."0.10.0" = self.buildNodePackage {
     name = "libxmljs-0.10.0";
+    version = "0.10.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
@@ -15469,27 +20455,17 @@
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
       "nan-1.1.2" = self.by-version."nan"."1.1.2";
     };
-    peerDependencies = [];
-  };
-  by-spec."libyaml"."*" =
-    self.by-version."libyaml"."0.2.5";
-  by-version."libyaml"."0.2.5" = self.buildNodePackage {
-    name = "libyaml-0.2.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.5.tgz";
-      name = "libyaml-0.2.5.tgz";
-      sha1 = "f34a920b728d8c1eddea56a6fa8698c28ceab6df";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "libyaml" = self.by-version."libyaml"."0.2.5";
   by-spec."liftoff"."^2.0.1" =
     self.by-version."liftoff"."2.0.1";
   by-version."liftoff"."2.0.1" = self.buildNodePackage {
     name = "liftoff-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.1.tgz";
@@ -15503,12 +20479,17 @@
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "resolve-1.0.0" = self.by-version."resolve"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lockfile"."~1.0.0" =
     self.by-version."lockfile"."1.0.0";
   by-version."lockfile"."1.0.0" = self.buildNodePackage {
     name = "lockfile-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz";
@@ -15517,26 +20498,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash"."*" =
-    self.by-version."lodash"."3.2.0";
-  by-version."lodash"."3.2.0" = self.buildNodePackage {
-    name = "lodash-3.2.0";
+    self.by-version."lodash"."3.3.0";
+  by-version."lodash"."3.3.0" = self.buildNodePackage {
+    name = "lodash-3.3.0";
+    version = "3.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
-      name = "lodash-3.2.0.tgz";
-      sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb";
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.3.0.tgz";
+      name = "lodash-3.3.0.tgz";
+      sha1 = "011ce52d01b14e60eaeea76acb9b8ba42c70581b";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash"."2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = self.buildNodePackage {
     name = "lodash-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
@@ -15545,18 +20536,23 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash".">=2.4.1" =
-    self.by-version."lodash"."3.2.0";
+    self.by-version."lodash"."3.3.0";
   by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-spec."lodash"."^3.2.0" =
-    self.by-version."lodash"."3.2.0";
+    self.by-version."lodash"."3.3.0";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = self.buildNodePackage {
     name = "lodash-0.9.2";
+    version = "0.9.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
@@ -15565,12 +20561,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash"."~1.0.1" =
     self.by-version."lodash"."1.0.1";
   by-version."lodash"."1.0.1" = self.buildNodePackage {
     name = "lodash-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
@@ -15579,12 +20580,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash"."~1.3.1" =
     self.by-version."lodash"."1.3.1";
   by-version."lodash"."1.3.1" = self.buildNodePackage {
     name = "lodash-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
@@ -15593,16 +20599,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
-  by-spec."lodash"."~3.2.0" =
+  by-spec."lodash"."~3.2" =
     self.by-version."lodash"."3.2.0";
+  by-version."lodash"."3.2.0" = self.buildNodePackage {
+    name = "lodash-3.2.0";
+    version = "3.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
+      name = "lodash-3.2.0.tgz";
+      sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."~3.3.0" =
+    self.by-version."lodash"."3.3.0";
   by-spec."lodash-deep"."^1.1.0" =
     self.by-version."lodash-deep"."1.5.3";
   by-version."lodash-deep"."1.5.3" = self.buildNodePackage {
     name = "lodash-deep-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.5.3.tgz";
@@ -15610,14 +20640,19 @@
       sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2";
     };
     deps = {
-      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash-node"."~2.4.1" =
     self.by-version."lodash-node"."2.4.1";
   by-version."lodash-node"."2.4.1" = self.buildNodePackage {
     name = "lodash-node-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
@@ -15626,12 +20661,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._basecopy"."^3.0.0" =
     self.by-version."lodash._basecopy"."3.0.0";
   by-version."lodash._basecopy"."3.0.0" = self.buildNodePackage {
     name = "lodash._basecopy-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz";
@@ -15640,26 +20680,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."lodash._baseslice"."^3.0.0" =
-    self.by-version."lodash._baseslice"."3.0.1";
-  by-version."lodash._baseslice"."3.0.1" = self.buildNodePackage {
-    name = "lodash._baseslice-3.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz";
-      name = "lodash._baseslice-3.0.1.tgz";
-      sha1 = "79c9a951f4b5a90f45f28a51664ab6532395e2f6";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._basetostring"."^3.0.0" =
     self.by-version."lodash._basetostring"."3.0.0";
   by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage {
     name = "lodash._basetostring-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz";
@@ -15668,12 +20699,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._basevalues"."^3.0.0" =
     self.by-version."lodash._basevalues"."3.0.0";
   by-version."lodash._basevalues"."3.0.0" = self.buildNodePackage {
     name = "lodash._basevalues-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
@@ -15682,12 +20718,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._createpad"."^3.0.0" =
     self.by-version."lodash._createpad"."3.0.1";
   by-version."lodash._createpad"."3.0.1" = self.buildNodePackage {
     name = "lodash._createpad-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz";
@@ -15697,26 +20738,36 @@
     deps = {
       "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._isiterateecall"."^3.0.0" =
-    self.by-version."lodash._isiterateecall"."3.0.1";
-  by-version."lodash._isiterateecall"."3.0.1" = self.buildNodePackage {
-    name = "lodash._isiterateecall-3.0.1";
+    self.by-version."lodash._isiterateecall"."3.0.2";
+  by-version."lodash._isiterateecall"."3.0.2" = self.buildNodePackage {
+    name = "lodash._isiterateecall-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz";
-      name = "lodash._isiterateecall-3.0.1.tgz";
-      sha1 = "3fb3284b7702ac22cb7d902c00a6fc26a3cd90e5";
+      url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.2.tgz";
+      name = "lodash._isiterateecall-3.0.2.tgz";
+      sha1 = "08287668d0cb67dcd4e25194be3f4f563b16c013";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._isnative"."~2.4.1" =
     self.by-version."lodash._isnative"."2.4.1";
   by-version."lodash._isnative"."2.4.1" = self.buildNodePackage {
     name = "lodash._isnative-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
@@ -15725,12 +20776,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._objecttypes"."~2.4.1" =
     self.by-version."lodash._objecttypes"."2.4.1";
   by-version."lodash._objecttypes"."2.4.1" = self.buildNodePackage {
     name = "lodash._objecttypes-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
@@ -15739,12 +20795,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._reescape"."^3.0.0" =
     self.by-version."lodash._reescape"."3.0.0";
   by-version."lodash._reescape"."3.0.0" = self.buildNodePackage {
     name = "lodash._reescape-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
@@ -15753,12 +20814,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._reevaluate"."^3.0.0" =
     self.by-version."lodash._reevaluate"."3.0.0";
   by-version."lodash._reevaluate"."3.0.0" = self.buildNodePackage {
     name = "lodash._reevaluate-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
@@ -15767,12 +20833,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash._reinterpolate"."^3.0.0" =
     self.by-version."lodash._reinterpolate"."3.0.0";
   by-version."lodash._reinterpolate"."3.0.0" = self.buildNodePackage {
     name = "lodash._reinterpolate-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz";
@@ -15781,12 +20852,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.debounce"."^2.4.1" =
     self.by-version."lodash.debounce"."2.4.1";
   by-version."lodash.debounce"."2.4.1" = self.buildNodePackage {
     name = "lodash.debounce-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
@@ -15798,12 +20874,17 @@
       "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1";
       "lodash.now-2.4.1" = self.by-version."lodash.now"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.escape"."^3.0.0" =
     self.by-version."lodash.escape"."3.0.0";
   by-version."lodash.escape"."3.0.0" = self.buildNodePackage {
     name = "lodash.escape-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz";
@@ -15813,12 +20894,17 @@
     deps = {
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.isarguments"."^3.0.0" =
     self.by-version."lodash.isarguments"."3.0.0";
   by-version."lodash.isarguments"."3.0.0" = self.buildNodePackage {
     name = "lodash.isarguments-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz";
@@ -15827,12 +20913,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.isarray"."^3.0.0" =
     self.by-version."lodash.isarray"."3.0.0";
   by-version."lodash.isarray"."3.0.0" = self.buildNodePackage {
     name = "lodash.isarray-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz";
@@ -15841,12 +20932,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.isfunction"."~2.4.1" =
     self.by-version."lodash.isfunction"."2.4.1";
   by-version."lodash.isfunction"."2.4.1" = self.buildNodePackage {
     name = "lodash.isfunction-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
@@ -15855,12 +20951,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.isnative"."^3.0.0" =
     self.by-version."lodash.isnative"."3.0.0";
   by-version."lodash.isnative"."3.0.0" = self.buildNodePackage {
     name = "lodash.isnative-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz";
@@ -15869,12 +20970,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.isobject"."~2.4.1" =
     self.by-version."lodash.isobject"."2.4.1";
   by-version."lodash.isobject"."2.4.1" = self.buildNodePackage {
     name = "lodash.isobject-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
@@ -15884,12 +20990,17 @@
     deps = {
       "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.keys"."^3.0.0" =
     self.by-version."lodash.keys"."3.0.3";
   by-version."lodash.keys"."3.0.3" = self.buildNodePackage {
     name = "lodash.keys-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz";
@@ -15901,12 +21012,17 @@
       "lodash.isarray-3.0.0" = self.by-version."lodash.isarray"."3.0.0";
       "lodash.isnative-3.0.0" = self.by-version."lodash.isnative"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.now"."~2.4.1" =
     self.by-version."lodash.now"."2.4.1";
   by-version."lodash.now"."2.4.1" = self.buildNodePackage {
     name = "lodash.now-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
@@ -15916,12 +21032,17 @@
     deps = {
       "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.pad"."^3.0.0" =
     self.by-version."lodash.pad"."3.0.0";
   by-version."lodash.pad"."3.0.0" = self.buildNodePackage {
     name = "lodash.pad-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz";
@@ -15932,12 +21053,17 @@
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
       "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.padleft"."^3.0.0" =
     self.by-version."lodash.padleft"."3.0.0";
   by-version."lodash.padleft"."3.0.0" = self.buildNodePackage {
     name = "lodash.padleft-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz";
@@ -15948,12 +21074,17 @@
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
       "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.padright"."^3.0.0" =
     self.by-version."lodash.padright"."3.0.0";
   by-version."lodash.padright"."3.0.0" = self.buildNodePackage {
     name = "lodash.padright-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz";
@@ -15964,12 +21095,17 @@
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
       "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.reescape"."^3.0.0" =
     self.by-version."lodash.reescape"."3.0.1";
   by-version."lodash.reescape"."3.0.1" = self.buildNodePackage {
     name = "lodash.reescape-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz";
@@ -15979,12 +21115,17 @@
     deps = {
       "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.reevaluate"."^3.0.0" =
     self.by-version."lodash.reevaluate"."3.0.1";
   by-version."lodash.reevaluate"."3.0.1" = self.buildNodePackage {
     name = "lodash.reevaluate-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz";
@@ -15994,12 +21135,17 @@
     deps = {
       "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.reinterpolate"."^3.0.0" =
     self.by-version."lodash.reinterpolate"."3.0.1";
   by-version."lodash.reinterpolate"."3.0.1" = self.buildNodePackage {
     name = "lodash.reinterpolate-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz";
@@ -16009,12 +21155,17 @@
     deps = {
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.repeat"."^3.0.0" =
     self.by-version."lodash.repeat"."3.0.0";
   by-version."lodash.repeat"."3.0.0" = self.buildNodePackage {
     name = "lodash.repeat-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz";
@@ -16024,51 +21175,65 @@
     deps = {
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.template"."^3.0.0" =
-    self.by-version."lodash.template"."3.2.0";
-  by-version."lodash.template"."3.2.0" = self.buildNodePackage {
-    name = "lodash.template-3.2.0";
+    self.by-version."lodash.template"."3.3.0";
+  by-version."lodash.template"."3.3.0" = self.buildNodePackage {
+    name = "lodash.template-3.3.0";
+    version = "3.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz";
-      name = "lodash.template-3.2.0.tgz";
-      sha1 = "04f6b39f4fd8aa2eb915a41adddd011ac41567c1";
+      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.3.0.tgz";
+      name = "lodash.template-3.3.0.tgz";
+      sha1 = "7392a42a6f18cf3cbaac587c01b7f922a0529b09";
     };
     deps = {
       "lodash._basecopy-3.0.0" = self.by-version."lodash._basecopy"."3.0.0";
-      "lodash._baseslice-3.0.1" = self.by-version."lodash._baseslice"."3.0.1";
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
       "lodash._basevalues-3.0.0" = self.by-version."lodash._basevalues"."3.0.0";
-      "lodash._isiterateecall-3.0.1" = self.by-version."lodash._isiterateecall"."3.0.1";
+      "lodash._isiterateecall-3.0.2" = self.by-version."lodash._isiterateecall"."3.0.2";
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
+      "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0";
       "lodash.keys-3.0.3" = self.by-version."lodash.keys"."3.0.3";
-      "lodash.templatesettings-3.0.1" = self.by-version."lodash.templatesettings"."3.0.1";
+      "lodash.templatesettings-3.1.0" = self.by-version."lodash.templatesettings"."3.1.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lodash.templatesettings"."^3.0.0" =
-    self.by-version."lodash.templatesettings"."3.0.1";
-  by-version."lodash.templatesettings"."3.0.1" = self.buildNodePackage {
-    name = "lodash.templatesettings-3.0.1";
+    self.by-version."lodash.templatesettings"."3.1.0";
+  by-version."lodash.templatesettings"."3.1.0" = self.buildNodePackage {
+    name = "lodash.templatesettings-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz";
-      name = "lodash.templatesettings-3.0.1.tgz";
-      sha1 = "7e3e332d6216d475a9347eb929339c8ffa209cfe";
+      url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz";
+      name = "lodash.templatesettings-3.1.0.tgz";
+      sha1 = "53852fd832b920605a2eb61919bcbbfb8f385bb6";
     };
     deps = {
-      "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0";
-      "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0";
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
       "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."log-driver"."1.2.4" =
     self.by-version."log-driver"."1.2.4";
   by-version."log-driver"."1.2.4" = self.buildNodePackage {
     name = "log-driver-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
@@ -16077,12 +21242,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."log4js"."~0.6.3" =
     self.by-version."log4js"."0.6.22";
   by-version."log4js"."0.6.22" = self.buildNodePackage {
     name = "log4js-0.6.22";
+    version = "0.6.22";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz";
@@ -16094,12 +21264,17 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "semver-1.1.4" = self.by-version."semver"."1.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."loggly"."0.3.x >=0.3.7" =
     self.by-version."loggly"."0.3.11";
   by-version."loggly"."0.3.11" = self.buildNodePackage {
     name = "loggly-0.3.11";
+    version = "0.3.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/loggly/-/loggly-0.3.11.tgz";
@@ -16110,12 +21285,17 @@
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "timespan-2.3.0" = self.by-version."timespan"."2.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lolex"."1.1.0" =
     self.by-version."lolex"."1.1.0";
   by-version."lolex"."1.1.0" = self.buildNodePackage {
     name = "lolex-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz";
@@ -16124,12 +21304,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."long"."~2 >=2.2.3" =
     self.by-version."long"."2.2.3";
   by-version."long"."2.2.3" = self.buildNodePackage {
     name = "long-2.2.3";
+    version = "2.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/long/-/long-2.2.3.tgz";
@@ -16138,12 +21323,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.4";
   by-version."longjohn"."0.2.4" = self.buildNodePackage {
     name = "longjohn-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
@@ -16152,12 +21342,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lowercase-keys"."^1.0.0" =
     self.by-version."lowercase-keys"."1.0.0";
   by-version."lowercase-keys"."1.0.0" = self.buildNodePackage {
     name = "lowercase-keys-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
@@ -16166,12 +21361,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2" =
     self.by-version."lru-cache"."2.5.0";
   by-version."lru-cache"."2.5.0" = self.buildNodePackage {
     name = "lru-cache-2.5.0";
+    version = "2.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
@@ -16180,12 +21380,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2.2.0" =
     self.by-version."lru-cache"."2.2.0";
   by-version."lru-cache"."2.2.0" = self.buildNodePackage {
     name = "lru-cache-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
@@ -16194,12 +21399,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2.2.x" =
     self.by-version."lru-cache"."2.2.4";
   by-version."lru-cache"."2.2.4" = self.buildNodePackage {
     name = "lru-cache-2.2.4";
+    version = "2.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
@@ -16208,12 +21418,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2.3.0" =
     self.by-version."lru-cache"."2.3.0";
   by-version."lru-cache"."2.3.0" = self.buildNodePackage {
     name = "lru-cache-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
@@ -16222,7 +21437,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2.5.x" =
     self.by-version."lru-cache"."2.5.0";
@@ -16230,6 +21449,7 @@
     self.by-version."lru-cache"."1.0.6";
   by-version."lru-cache"."1.0.6" = self.buildNodePackage {
     name = "lru-cache-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
@@ -16238,12 +21458,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."~2.3.0" =
     self.by-version."lru-cache"."2.3.1";
   by-version."lru-cache"."2.3.1" = self.buildNodePackage {
     name = "lru-cache-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
@@ -16252,7 +21477,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
@@ -16260,6 +21489,7 @@
     self.by-version."lru-queue"."0.1.0";
   by-version."lru-queue"."0.1.0" = self.buildNodePackage {
     name = "lru-queue-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
@@ -16269,12 +21499,17 @@
     deps = {
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lsmod"."~0.0.3" =
     self.by-version."lsmod"."0.0.3";
   by-version."lsmod"."0.0.3" = self.buildNodePackage {
     name = "lsmod-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
@@ -16283,12 +21518,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ltx"."*" =
     self.by-version."ltx"."0.9.0";
   by-version."ltx"."0.9.0" = self.buildNodePackage {
     name = "ltx-0.9.0";
+    version = "0.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ltx/-/ltx-0.9.0.tgz";
@@ -16299,7 +21539,11 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "ltx" = self.by-version."ltx"."0.9.0";
   by-spec."ltx"."0.x" =
@@ -16310,6 +21554,7 @@
     self.by-version."ltx"."0.5.2";
   by-version."ltx"."0.5.2" = self.buildNodePackage {
     name = "ltx-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz";
@@ -16320,7 +21565,11 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ltx"."^0.9.0" =
     self.by-version."ltx"."0.9.0";
@@ -16328,6 +21577,7 @@
     self.by-version."ltx"."0.3.4";
   by-version."ltx"."0.3.4" = self.buildNodePackage {
     name = "ltx-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz";
@@ -16338,7 +21588,11 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.1.4" = self.by-version."node-expat"."2.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ltx"."~0.3.3" =
     self.by-version."ltx"."0.3.4";
@@ -16346,6 +21600,7 @@
     self.by-version."ltx"."0.6.0";
   by-version."ltx"."0.6.0" = self.buildNodePackage {
     name = "ltx-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz";
@@ -16356,7 +21611,11 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ltx"."~0.x" =
     self.by-version."ltx"."0.9.0";
@@ -16364,6 +21623,7 @@
     self.by-version."m8"."0.4.4";
   by-version."m8"."0.4.4" = self.buildNodePackage {
     name = "m8-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz";
@@ -16372,12 +21632,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."magnet-uri"."^2.0.1" =
     self.by-version."magnet-uri"."2.0.1";
   by-version."magnet-uri"."2.0.1" = self.buildNodePackage {
     name = "magnet-uri-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
@@ -16387,7 +21652,11 @@
     deps = {
       "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
@@ -16395,6 +21664,7 @@
     self.by-version."mailchimp"."1.1.0";
   by-version."mailchimp"."1.1.0" = self.buildNodePackage {
     name = "mailchimp-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mailchimp/-/mailchimp-1.1.0.tgz";
@@ -16405,12 +21675,17 @@
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "qs-0.5.6" = self.by-version."qs"."0.5.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
     self.by-version."mailcomposer"."0.2.12";
   by-version."mailcomposer"."0.2.12" = self.buildNodePackage {
     name = "mailcomposer-0.2.12";
+    version = "0.2.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
@@ -16418,13 +21693,17 @@
       sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681";
     };
     deps = {
-      "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18";
+      "mimelib-0.2.19" = self.by-version."mimelib"."0.2.19";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "he-0.3.6" = self.by-version."he"."0.3.6";
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
       "dkim-signer-0.1.2" = self.by-version."dkim-signer"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mailcomposer"."~0.2.10" =
     self.by-version."mailcomposer"."0.2.12";
@@ -16432,6 +21711,7 @@
     self.by-version."mailgun-js"."0.6.8";
   by-version."mailgun-js"."0.6.8" = self.buildNodePackage {
     name = "mailgun-js-0.6.8";
+    version = "0.6.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.8.tgz";
@@ -16447,12 +21727,17 @@
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."map-obj"."^1.0.0" =
     self.by-version."map-obj"."1.0.0";
   by-version."map-obj"."1.0.0" = self.buildNodePackage {
     name = "map-obj-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz";
@@ -16461,12 +21746,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."marked"."*" =
     self.by-version."marked"."0.3.3";
   by-version."marked"."0.3.3" = self.buildNodePackage {
     name = "marked-0.3.3";
+    version = "0.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz";
@@ -16475,19 +21765,22 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "marked" = self.by-version."marked"."0.3.3";
   by-spec."marked".">=0.2.9" =
     self.by-version."marked"."0.3.3";
-  by-spec."marked".">=0.3.1" =
-    self.by-version."marked"."0.3.3";
   by-spec."marked"."^0.3.2" =
     self.by-version."marked"."0.3.3";
   by-spec."mathjs"."~0.19.0" =
     self.by-version."mathjs"."0.19.0";
   by-version."mathjs"."0.19.0" = self.buildNodePackage {
     name = "mathjs-0.19.0";
+    version = "0.19.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mathjs/-/mathjs-0.19.0.tgz";
@@ -16497,12 +21790,17 @@
     deps = {
       "bignumber.js-1.5.0" = self.by-version."bignumber.js"."1.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."maxmin"."^1.0.0" =
     self.by-version."maxmin"."1.0.0";
   by-version."maxmin"."1.0.0" = self.buildNodePackage {
     name = "maxmin-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz";
@@ -16515,28 +21813,17 @@
       "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0";
       "pretty-bytes-1.0.3" = self.by-version."pretty-bytes"."1.0.3";
     };
-    peerDependencies = [];
-  };
-  by-spec."mdns-js"."0.2.x" =
-    self.by-version."mdns-js"."0.2.9";
-  by-version."mdns-js"."0.2.9" = self.buildNodePackage {
-    name = "mdns-js-0.2.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mdns-js/-/mdns-js-0.2.9.tgz";
-      name = "mdns-js-0.2.9.tgz";
-      sha1 = "4b0a77da832fe3857736f584b99ee07912f0c1e0";
-    };
-    deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" =
     self.by-version."mdns-js"."0.2.5";
   by-version."mdns-js"."0.2.5" = self.buildNodePackage {
     name = "mdns-js-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchgit {
       url = "https://github.com/guerrerocarlos/node-mdns-js";
@@ -16547,12 +21834,39 @@
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "mdns-js-packet-0.1.9" = self.by-version."mdns-js-packet"."0.1.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mdns-js"."git+https://github.com/xat/node-mdns-js#reuseAddr" =
+    self.by-version."mdns-js"."0.2.9";
+  by-version."mdns-js"."0.2.9" = self.buildNodePackage {
+    name = "mdns-js-0.2.9";
+    version = "0.2.9";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/xat/node-mdns-js";
+      rev = "bc5598ff86c441cb256503e3d951e8b6b8079e8a";
+      sha256 = "93595e09e7802a67c1923630be4ac20410f0ac8b89c34e200b943f7157f395f6";
+    };
+    deps = {
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8";
+      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mdns-js-packet"."0.1.x" =
     self.by-version."mdns-js-packet"."0.1.8";
   by-version."mdns-js-packet"."0.1.8" = self.buildNodePackage {
     name = "mdns-js-packet-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz";
@@ -16563,12 +21877,17 @@
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "qap-3.1.3" = self.by-version."qap"."3.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mdns-js-packet"."guerrerocarlos/node-mdns-js-packet" =
     self.by-version."mdns-js-packet"."0.1.9";
   by-version."mdns-js-packet"."0.1.9" = self.buildNodePackage {
     name = "mdns-js-packet-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchgit {
       url = "git://github.com/guerrerocarlos/node-mdns-js-packet";
@@ -16579,12 +21898,17 @@
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "qap-3.1.3" = self.by-version."qap"."3.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."meat"."*" =
     self.by-version."meat"."0.3.3";
   by-version."meat"."0.3.3" = self.buildNodePackage {
     name = "meat-0.3.3";
+    version = "0.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/meat/-/meat-0.3.3.tgz";
@@ -16599,13 +21923,18 @@
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
       "node.extend-1.0.0" = self.by-version."node.extend"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "meat" = self.by-version."meat"."0.3.3";
   by-spec."media-typer"."0.2.0" =
     self.by-version."media-typer"."0.2.0";
   by-version."media-typer"."0.2.0" = self.buildNodePackage {
     name = "media-typer-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
@@ -16614,12 +21943,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."media-typer"."0.3.0" =
     self.by-version."media-typer"."0.3.0";
   by-version."media-typer"."0.3.0" = self.buildNodePackage {
     name = "media-typer-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
@@ -16628,12 +21962,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."memoizee"."0.3.x" =
     self.by-version."memoizee"."0.3.8";
   by-version."memoizee"."0.3.8" = self.buildNodePackage {
     name = "memoizee-0.3.8";
+    version = "0.3.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz";
@@ -16649,12 +21988,38 @@
       "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
       "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."memory-fs"."^0.2.0" =
+    self.by-version."memory-fs"."0.2.0";
+  by-version."memory-fs"."0.2.0" = self.buildNodePackage {
+    name = "memory-fs-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
+      name = "memory-fs-0.2.0.tgz";
+      sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."memory-fs"."~0.2.0" =
+    self.by-version."memory-fs"."0.2.0";
   by-spec."memwatch"."^0.2.2" =
     self.by-version."memwatch"."0.2.2";
   by-version."memwatch"."0.2.2" = self.buildNodePackage {
     name = "memwatch-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/memwatch/-/memwatch-0.2.2.tgz";
@@ -16663,12 +22028,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."meow"."*" =
     self.by-version."meow"."3.0.0";
   by-version."meow"."3.0.0" = self.buildNodePackage {
     name = "meow-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/meow/-/meow-3.0.0.tgz";
@@ -16681,7 +22051,11 @@
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."meow"."^3.0.0" =
     self.by-version."meow"."3.0.0";
@@ -16689,6 +22063,7 @@
     self.by-version."merge-descriptors"."0.0.2";
   by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
     name = "merge-descriptors-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
@@ -16697,12 +22072,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."method-override"."1.0.0" =
     self.by-version."method-override"."1.0.0";
   by-version."method-override"."1.0.0" = self.buildNodePackage {
     name = "method-override-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
@@ -16712,12 +22092,17 @@
     deps = {
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."method-override"."^1.0.0" =
     self.by-version."method-override"."1.0.2";
   by-version."method-override"."1.0.2" = self.buildNodePackage {
     name = "method-override-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/method-override/-/method-override-1.0.2.tgz";
@@ -16727,12 +22112,17 @@
     deps = {
       "methods-1.0.0" = self.by-version."methods"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."method-override"."~2.2.0" =
     self.by-version."method-override"."2.2.0";
   by-version."method-override"."2.2.0" = self.buildNodePackage {
     name = "method-override-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz";
@@ -16745,12 +22135,17 @@
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."method-override"."~2.3.1" =
     self.by-version."method-override"."2.3.1";
   by-version."method-override"."2.3.1" = self.buildNodePackage {
     name = "method-override-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz";
@@ -16763,12 +22158,17 @@
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."*" =
     self.by-version."methods"."1.1.1";
   by-version."methods"."1.1.1" = self.buildNodePackage {
     name = "methods-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
@@ -16777,12 +22177,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
   by-version."methods"."0.0.1" = self.buildNodePackage {
     name = "methods-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
@@ -16791,12 +22196,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."0.1.0" =
     self.by-version."methods"."0.1.0";
   by-version."methods"."0.1.0" = self.buildNodePackage {
     name = "methods-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
@@ -16805,12 +22215,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."1.0.0" =
     self.by-version."methods"."1.0.0";
   by-version."methods"."1.0.0" = self.buildNodePackage {
     name = "methods-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
@@ -16819,12 +22234,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."1.0.1" =
     self.by-version."methods"."1.0.1";
   by-version."methods"."1.0.1" = self.buildNodePackage {
     name = "methods-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
@@ -16833,12 +22253,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."1.1.0" =
     self.by-version."methods"."1.1.0";
   by-version."methods"."1.1.0" = self.buildNodePackage {
     name = "methods-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
@@ -16847,7 +22272,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."methods"."1.1.1" =
     self.by-version."methods"."1.1.1";
@@ -16859,6 +22288,7 @@
     self.by-version."microee"."0.0.2";
   by-version."microee"."0.0.2" = self.buildNodePackage {
     name = "microee-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
@@ -16867,12 +22297,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."miller-rabin"."^1.1.2" =
     self.by-version."miller-rabin"."1.1.5";
   by-version."miller-rabin"."1.1.5" = self.buildNodePackage {
     name = "miller-rabin-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz";
@@ -16883,12 +22318,17 @@
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."*" =
     self.by-version."mime"."1.3.4";
   by-version."mime"."1.3.4" = self.buildNodePackage {
     name = "mime-1.3.4";
+    version = "1.3.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
@@ -16897,12 +22337,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."1.2.11" =
     self.by-version."mime"."1.2.11";
   by-version."mime"."1.2.11" = self.buildNodePackage {
     name = "mime-1.2.11";
+    version = "1.2.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
@@ -16911,12 +22356,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."1.2.4" =
     self.by-version."mime"."1.2.4";
   by-version."mime"."1.2.4" = self.buildNodePackage {
     name = "mime-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
@@ -16925,12 +22375,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."1.2.6" =
     self.by-version."mime"."1.2.6";
   by-version."mime"."1.2.6" = self.buildNodePackage {
     name = "mime-1.2.6";
+    version = "1.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
@@ -16939,12 +22394,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."1.2.9" =
     self.by-version."mime"."1.2.9";
   by-version."mime"."1.2.9" = self.buildNodePackage {
     name = "mime-1.2.9";
+    version = "1.2.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
@@ -16953,7 +22413,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime"."1.3.4" =
     self.by-version."mime"."1.3.4";
@@ -16975,6 +22439,7 @@
     self.by-version."mime-db"."1.7.0";
   by-version."mime-db"."1.7.0" = self.buildNodePackage {
     name = "mime-db-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz";
@@ -16983,7 +22448,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime-db"."~1.7.0" =
     self.by-version."mime-db"."1.7.0";
@@ -16991,6 +22460,7 @@
     self.by-version."mime-types"."2.0.9";
   by-version."mime-types"."2.0.9" = self.buildNodePackage {
     name = "mime-types-2.0.9";
+    version = "2.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz";
@@ -17000,12 +22470,17 @@
     deps = {
       "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime-types"."~1.0.0" =
     self.by-version."mime-types"."1.0.2";
   by-version."mime-types"."1.0.2" = self.buildNodePackage {
     name = "mime-types-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
@@ -17014,7 +22489,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mime-types"."~1.0.1" =
     self.by-version."mime-types"."1.0.2";
@@ -17027,25 +22506,31 @@
   by-spec."mime-types"."~2.0.9" =
     self.by-version."mime-types"."2.0.9";
   by-spec."mimelib"."~0.2.15" =
-    self.by-version."mimelib"."0.2.18";
-  by-version."mimelib"."0.2.18" = self.buildNodePackage {
-    name = "mimelib-0.2.18";
+    self.by-version."mimelib"."0.2.19";
+  by-version."mimelib"."0.2.19" = self.buildNodePackage {
+    name = "mimelib-0.2.19";
+    version = "0.2.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.18.tgz";
-      name = "mimelib-0.2.18.tgz";
-      sha1 = "2e631a3db449026fcb85099398b7bd750eac46a7";
+      url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz";
+      name = "mimelib-0.2.19.tgz";
+      sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee";
     };
     deps = {
       "encoding-0.1.11" = self.by-version."encoding"."0.1.11";
-      "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1";
+      "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mine"."~0.0.1" =
     self.by-version."mine"."0.0.2";
   by-version."mine"."0.0.2" = self.buildNodePackage {
     name = "mine-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz";
@@ -17054,12 +22539,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minilog"."~2.0.2" =
     self.by-version."minilog"."2.0.6";
   by-version."minilog"."2.0.6" = self.buildNodePackage {
     name = "minilog-2.0.6";
+    version = "2.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz";
@@ -17069,12 +22559,17 @@
     deps = {
       "microee-0.0.2" = self.by-version."microee"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimalistic-assert"."^1.0.0" =
     self.by-version."minimalistic-assert"."1.0.0";
   by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage {
     name = "minimalistic-assert-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
@@ -17083,12 +22578,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."0.0.x" =
     self.by-version."minimatch"."0.0.5";
   by-version."minimatch"."0.0.5" = self.buildNodePackage {
     name = "minimatch-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
@@ -17098,12 +22598,17 @@
     deps = {
       "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."0.3" =
     self.by-version."minimatch"."0.3.0";
   by-version."minimatch"."0.3.0" = self.buildNodePackage {
     name = "minimatch-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
@@ -17114,12 +22619,17 @@
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."0.x" =
     self.by-version."minimatch"."0.4.0";
   by-version."minimatch"."0.4.0" = self.buildNodePackage {
     name = "minimatch-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
@@ -17130,12 +22640,17 @@
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."1" =
     self.by-version."minimatch"."1.0.0";
   by-version."minimatch"."1.0.0" = self.buildNodePackage {
     name = "minimatch-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
@@ -17146,7 +22661,11 @@
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."1.0.x" =
     self.by-version."minimatch"."1.0.0";
@@ -17154,6 +22673,7 @@
     self.by-version."minimatch"."2.0.1";
   by-version."minimatch"."2.0.1" = self.buildNodePackage {
     name = "minimatch-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
@@ -17163,7 +22683,11 @@
     deps = {
       "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."^1.0.0" =
     self.by-version."minimatch"."1.0.0";
@@ -17173,6 +22697,7 @@
     self.by-version."minimatch"."0.2.14";
   by-version."minimatch"."0.2.14" = self.buildNodePackage {
     name = "minimatch-0.2.14";
+    version = "0.2.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
@@ -17183,7 +22708,11 @@
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."~0.2.0" =
     self.by-version."minimatch"."0.2.14";
@@ -17203,6 +22732,7 @@
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = self.buildNodePackage {
     name = "minimist-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
@@ -17211,12 +22741,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."minimist"."^1.1.0" =
+  by-spec."minimist"."1.1.0" =
     self.by-version."minimist"."1.1.0";
   by-version."minimist"."1.1.0" = self.buildNodePackage {
     name = "minimist-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
@@ -17225,12 +22760,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."minimist"."^1.1.0" =
+    self.by-version."minimist"."1.1.0";
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.10";
   by-version."minimist"."0.0.10" = self.buildNodePackage {
     name = "minimist-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
@@ -17239,7 +22781,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist"."~0.0.5" =
     self.by-version."minimist"."0.0.10";
@@ -17249,6 +22795,7 @@
     self.by-version."minimist"."0.2.0";
   by-version."minimist"."0.2.0" = self.buildNodePackage {
     name = "minimist-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
@@ -17257,7 +22804,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist"."~1.1.0" =
     self.by-version."minimist"."1.1.0";
@@ -17265,6 +22816,7 @@
     self.by-version."ministyle"."0.1.4";
   by-version."ministyle"."0.1.4" = self.buildNodePackage {
     name = "ministyle-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
@@ -17273,12 +22825,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."miniwrite"."~0.1.3" =
     self.by-version."miniwrite"."0.1.4";
   by-version."miniwrite"."0.1.4" = self.buildNodePackage {
     name = "miniwrite-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz";
@@ -17288,12 +22845,17 @@
     deps = {
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."*" =
     self.by-version."mkdirp"."0.5.0";
   by-version."mkdirp"."0.5.0" = self.buildNodePackage {
     name = "mkdirp-0.5.0";
+    version = "0.5.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
@@ -17303,13 +22865,18 @@
     deps = {
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mkdirp" = self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.0.x" =
     self.by-version."mkdirp"."0.0.7";
   by-version."mkdirp"."0.0.7" = self.buildNodePackage {
     name = "mkdirp-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
@@ -17318,12 +22885,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
   by-version."mkdirp"."0.3.0" = self.buildNodePackage {
     name = "mkdirp-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
@@ -17332,12 +22904,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.3.5" =
     self.by-version."mkdirp"."0.3.5";
   by-version."mkdirp"."0.3.5" = self.buildNodePackage {
     name = "mkdirp-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
@@ -17346,7 +22923,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.3.x" =
     self.by-version."mkdirp"."0.3.5";
@@ -17354,6 +22935,7 @@
     self.by-version."mkdirp"."0.4.0";
   by-version."mkdirp"."0.4.0" = self.buildNodePackage {
     name = "mkdirp-0.4.0";
+    version = "0.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
@@ -17362,7 +22944,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.5" =
     self.by-version."mkdirp"."0.5.0";
@@ -17394,6 +22980,7 @@
     self.by-version."mkpath"."0.1.0";
   by-version."mkpath"."0.1.0" = self.buildNodePackage {
     name = "mkpath-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
@@ -17402,12 +22989,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mocha"."*" =
     self.by-version."mocha"."2.1.0";
   by-version."mocha"."2.1.0" = self.buildNodePackage {
     name = "mocha-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mocha/-/mocha-2.1.0.tgz";
@@ -17424,13 +23016,18 @@
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mocha" = self.by-version."mocha"."2.1.0";
   by-spec."mocha"."~1.20.1" =
     self.by-version."mocha"."1.20.1";
   by-version."mocha"."1.20.1" = self.buildNodePackage {
     name = "mocha-1.20.1";
+    version = "1.20.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
@@ -17446,12 +23043,17 @@
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "glob-3.2.3" = self.by-version."glob"."3.2.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mocha-phantomjs"."*" =
     self.by-version."mocha-phantomjs"."3.5.3";
   by-version."mocha-phantomjs"."3.5.3" = self.buildNodePackage {
     name = "mocha-phantomjs-3.5.3";
+    version = "3.5.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.3.tgz";
@@ -17462,14 +23064,19 @@
       "mocha-1.20.1" = self.by-version."mocha"."1.20.1";
       "commander-2.0.0" = self.by-version."commander"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [
       self.by-version."phantomjs"."1.9.15"];
+    os = [ ];
+    cpu = [ ];
   };
   "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.3";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-version."mocha-unfunk-reporter"."0.4.0" = self.buildNodePackage {
     name = "mocha-unfunk-reporter-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
@@ -17482,22 +23089,27 @@
       "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4";
       "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-spec."module-deps"."^3.6.3" =
-    self.by-version."module-deps"."3.7.1";
-  by-version."module-deps"."3.7.1" = self.buildNodePackage {
-    name = "module-deps-3.7.1";
+    self.by-version."module-deps"."3.7.2";
+  by-version."module-deps"."3.7.2" = self.buildNodePackage {
+    name = "module-deps-3.7.2";
+    version = "3.7.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.1.tgz";
-      name = "module-deps-3.7.1.tgz";
-      sha1 = "5bbaaf9e6ba252cf0912b9839f47a3b1e46e0a42";
+      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.2.tgz";
+      name = "module-deps-3.7.2.tgz";
+      sha1 = "bd4ceaca556b16032ac5abbf47ac61bc0ff5c349";
     };
     deps = {
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0";
+      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "detective-4.0.0" = self.by-version."detective"."4.0.0";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
@@ -17505,18 +23117,26 @@
       "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-1.1.3" = self.by-version."resolve"."1.1.3";
+      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
       "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2";
       "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
       "through2-0.4.2" = self.by-version."through2"."0.4.2";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."module-deps"."^3.7.0" =
+    self.by-version."module-deps"."3.7.2";
   by-spec."module-deps"."~1.2.2" =
     self.by-version."module-deps"."1.2.2";
   by-version."module-deps"."1.2.2" = self.buildNodePackage {
     name = "module-deps-1.2.2";
+    version = "1.2.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz";
@@ -17533,12 +23153,17 @@
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."module-deps"."~1.4.0" =
     self.by-version."module-deps"."1.4.2";
   by-version."module-deps"."1.4.2" = self.buildNodePackage {
     name = "module-deps-1.4.2";
+    version = "1.4.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz";
@@ -17555,12 +23180,17 @@
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
       "mine-0.0.2" = self.by-version."mine"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
   by-version."moment"."2.1.0" = self.buildNodePackage {
     name = "moment-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
@@ -17569,12 +23199,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment".">= 2.1.0" =
     self.by-version."moment"."2.9.0";
   by-version."moment"."2.9.0" = self.buildNodePackage {
     name = "moment-2.9.0";
+    version = "2.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz";
@@ -17583,7 +23218,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment".">= 2.6.0" =
     self.by-version."moment"."2.9.0";
@@ -17597,6 +23236,7 @@
     self.by-version."moment"."2.4.0";
   by-version."moment"."2.4.0" = self.buildNodePackage {
     name = "moment-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
@@ -17605,12 +23245,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment"."~2.5.1" =
     self.by-version."moment"."2.5.1";
   by-version."moment"."2.5.1" = self.buildNodePackage {
     name = "moment-2.5.1";
+    version = "2.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
@@ -17619,12 +23264,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment"."~2.8.4" =
     self.by-version."moment"."2.8.4";
   by-version."moment"."2.8.4" = self.buildNodePackage {
     name = "moment-2.8.4";
+    version = "2.8.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz";
@@ -17633,12 +23283,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment-timezone"."0.0.3" =
     self.by-version."moment-timezone"."0.0.3";
   by-version."moment-timezone"."0.0.3" = self.buildNodePackage {
     name = "moment-timezone-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.0.3.tgz";
@@ -17648,12 +23303,17 @@
     deps = {
       "moment-2.9.0" = self.by-version."moment"."2.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."moment-timezone"."0.2.4" =
     self.by-version."moment-timezone"."0.2.4";
   by-version."moment-timezone"."0.2.4" = self.buildNodePackage {
     name = "moment-timezone-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.2.4.tgz";
@@ -17663,12 +23323,17 @@
     deps = {
       "moment-2.9.0" = self.by-version."moment"."2.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = self.buildNodePackage {
     name = "mongodb-1.2.14";
+    version = "1.2.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
@@ -17678,12 +23343,17 @@
     deps = {
       "bson-0.1.8" = self.by-version."bson"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb"."1.3.19" =
     self.by-version."mongodb"."1.3.19";
   by-version."mongodb"."1.3.19" = self.buildNodePackage {
     name = "mongodb-1.3.19";
+    version = "1.3.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
@@ -17692,14 +23362,19 @@
     };
     deps = {
       "bson-0.2.2" = self.by-version."bson"."0.2.2";
+    };
+    optionalDependencies = {
       "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb"."1.4.12" =
     self.by-version."mongodb"."1.4.12";
   by-version."mongodb"."1.4.12" = self.buildNodePackage {
     name = "mongodb-1.4.12";
+    version = "1.4.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz";
@@ -17708,15 +23383,20 @@
     };
     deps = {
       "bson-0.2.19" = self.by-version."bson"."0.2.19";
+    };
+    optionalDependencies = {
       "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb"."1.4.28" =
     self.by-version."mongodb"."1.4.28";
   by-version."mongodb"."1.4.28" = self.buildNodePackage {
     name = "mongodb-1.4.28";
+    version = "1.4.28";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.28.tgz";
@@ -17725,15 +23405,20 @@
     };
     deps = {
       "bson-0.2.19" = self.by-version."bson"."0.2.19";
+    };
+    optionalDependencies = {
       "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.1.0" =
     self.by-version."mongodb"."2.0.16";
   by-version."mongodb"."2.0.16" = self.buildNodePackage {
     name = "mongodb-2.0.16";
+    version = "2.0.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.16.tgz";
@@ -17744,7 +23429,11 @@
       "mongodb-core-1.1.12" = self.by-version."mongodb-core"."1.1.12";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongodb"."~2.0" =
     self.by-version."mongodb"."2.0.16";
@@ -17752,6 +23441,7 @@
     self.by-version."mongodb-core"."1.1.12";
   by-version."mongodb-core"."1.1.12" = self.buildNodePackage {
     name = "mongodb-core-1.1.12";
+    version = "1.1.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.12.tgz";
@@ -17762,14 +23452,19 @@
       "bson-0.2.19" = self.by-version."bson"."0.2.19";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6";
+    };
+    optionalDependencies = {
       "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongoose"."3.6.7" =
     self.by-version."mongoose"."3.6.7";
   by-version."mongoose"."3.6.7" = self.buildNodePackage {
     name = "mongoose-3.6.7";
+    version = "3.6.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
@@ -17785,12 +23480,17 @@
       "mpromise-0.2.1" = self.by-version."mpromise"."0.2.1";
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongoose"."3.6.x" =
     self.by-version."mongoose"."3.6.20";
   by-version."mongoose"."3.6.20" = self.buildNodePackage {
     name = "mongoose-3.6.20";
+    version = "3.6.20";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
@@ -17807,13 +23507,18 @@
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mongoose" = self.by-version."mongoose"."3.6.20";
   by-spec."mongoose"."3.8.x" =
     self.by-version."mongoose"."3.8.23";
   by-version."mongoose"."3.8.23" = self.buildNodePackage {
     name = "mongoose-3.8.23";
+    version = "3.8.23";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.23.tgz";
@@ -17831,12 +23536,17 @@
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
       "mquery-0.8.0" = self.by-version."mquery"."0.8.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongoose"."3.9.7" =
     self.by-version."mongoose"."3.9.7";
   by-version."mongoose"."3.9.7" = self.buildNodePackage {
     name = "mongoose-3.9.7";
+    version = "3.9.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.7.tgz";
@@ -17856,12 +23566,17 @@
       "mquery-1.0.0" = self.by-version."mquery"."1.0.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongoose-lifecycle"."1.0.0" =
     self.by-version."mongoose-lifecycle"."1.0.0";
   by-version."mongoose-lifecycle"."1.0.0" = self.buildNodePackage {
     name = "mongoose-lifecycle-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
@@ -17870,12 +23585,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mongoose-schema-extend"."*" =
     self.by-version."mongoose-schema-extend"."0.1.7";
   by-version."mongoose-schema-extend"."0.1.7" = self.buildNodePackage {
     name = "mongoose-schema-extend-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
@@ -17885,13 +23605,18 @@
     deps = {
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.7";
   by-spec."monocle"."1.1.50" =
     self.by-version."monocle"."1.1.50";
   by-version."monocle"."1.1.50" = self.buildNodePackage {
     name = "monocle-1.1.50";
+    version = "1.1.50";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
@@ -17901,12 +23626,17 @@
     deps = {
       "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."monocle"."1.1.51" =
     self.by-version."monocle"."1.1.51";
   by-version."monocle"."1.1.51" = self.buildNodePackage {
     name = "monocle-1.1.51";
+    version = "1.1.51";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
@@ -17916,12 +23646,17 @@
     deps = {
       "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."morgan"."1.0.0" =
     self.by-version."morgan"."1.0.0";
   by-version."morgan"."1.0.0" = self.buildNodePackage {
     name = "morgan-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
@@ -17931,12 +23666,17 @@
     deps = {
       "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."morgan"."1.2.0" =
     self.by-version."morgan"."1.2.0";
   by-version."morgan"."1.2.0" = self.buildNodePackage {
     name = "morgan-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/morgan/-/morgan-1.2.0.tgz";
@@ -17949,12 +23689,17 @@
       "depd-0.4.2" = self.by-version."depd"."0.4.2";
       "finished-1.2.2" = self.by-version."finished"."1.2.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."morgan"."~1.3.2" =
+  by-spec."morgan"."~1.3.1" =
     self.by-version."morgan"."1.3.2";
   by-version."morgan"."1.3.2" = self.buildNodePackage {
     name = "morgan-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz";
@@ -17966,12 +23711,19 @@
       "depd-0.4.5" = self.by-version."depd"."0.4.5";
       "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."morgan"."~1.3.2" =
+    self.by-version."morgan"."1.3.2";
   by-spec."morgan"."~1.5.1" =
     self.by-version."morgan"."1.5.1";
   by-version."morgan"."1.5.1" = self.buildNodePackage {
     name = "morgan-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz";
@@ -17984,12 +23736,17 @@
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mount-point"."^1.0.0" =
     self.by-version."mount-point"."1.0.3";
   by-version."mount-point"."1.0.3" = self.buildNodePackage {
     name = "mount-point-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz";
@@ -17999,12 +23756,17 @@
     deps = {
       "node-df-0.1.1" = self.by-version."node-df"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mout"."~0.9.0" =
     self.by-version."mout"."0.9.1";
   by-version."mout"."0.9.1" = self.buildNodePackage {
     name = "mout-0.9.1";
+    version = "0.9.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
@@ -18013,12 +23775,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = self.buildNodePackage {
     name = "mpath-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
@@ -18027,12 +23794,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mpromise"."0.2.1" =
     self.by-version."mpromise"."0.2.1";
   by-version."mpromise"."0.2.1" = self.buildNodePackage {
     name = "mpromise-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
@@ -18042,12 +23814,17 @@
     deps = {
       "sliced-0.0.4" = self.by-version."sliced"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mpromise"."0.4.3" =
     self.by-version."mpromise"."0.4.3";
   by-version."mpromise"."0.4.3" = self.buildNodePackage {
     name = "mpromise-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
@@ -18056,12 +23833,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mpromise"."0.5.4" =
     self.by-version."mpromise"."0.5.4";
   by-version."mpromise"."0.5.4" = self.buildNodePackage {
     name = "mpromise-0.5.4";
+    version = "0.5.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz";
@@ -18070,12 +23852,37 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mqtt"."0.3.x" =
+    self.by-version."mqtt"."0.3.13";
+  by-version."mqtt"."0.3.13" = self.buildNodePackage {
+    name = "mqtt-0.3.13";
+    version = "0.3.13";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mqtt/-/mqtt-0.3.13.tgz";
+      name = "mqtt-0.3.13.tgz";
+      sha1 = "f65fbe323901b664427b471658428dcfa1d5bee4";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mquery"."0.8.0" =
     self.by-version."mquery"."0.8.0";
   by-version."mquery"."0.8.0" = self.buildNodePackage {
     name = "mquery-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
@@ -18087,12 +23894,17 @@
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mquery"."1.0.0" =
     self.by-version."mquery"."1.0.0";
   by-version."mquery"."1.0.0" = self.buildNodePackage {
     name = "mquery-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz";
@@ -18104,12 +23916,17 @@
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ms"."0.1.0" =
     self.by-version."ms"."0.1.0";
   by-version."ms"."0.1.0" = self.buildNodePackage {
     name = "ms-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
@@ -18118,12 +23935,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ms"."0.6.2" =
     self.by-version."ms"."0.6.2";
   by-version."ms"."0.6.2" = self.buildNodePackage {
     name = "ms-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
@@ -18132,12 +23954,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ms"."0.7.0" =
     self.by-version."ms"."0.7.0";
   by-version."ms"."0.7.0" = self.buildNodePackage {
     name = "ms-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
@@ -18146,12 +23973,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."msgpack".">= 0.0.1" =
     self.by-version."msgpack"."0.2.6";
   by-version."msgpack"."0.2.6" = self.buildNodePackage {
     name = "msgpack-0.2.6";
+    version = "0.2.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.6.tgz";
@@ -18161,17 +23993,22 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."multer".">=0.0.6" =
-    self.by-version."multer"."0.1.7";
-  by-version."multer"."0.1.7" = self.buildNodePackage {
-    name = "multer-0.1.7";
+    self.by-version."multer"."0.1.8";
+  by-version."multer"."0.1.8" = self.buildNodePackage {
+    name = "multer-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multer/-/multer-0.1.7.tgz";
-      name = "multer-0.1.7.tgz";
-      sha1 = "bc2b7f72a32ad08496e209881ee348f38c495b22";
+      url = "http://registry.npmjs.org/multer/-/multer-0.1.8.tgz";
+      name = "multer-0.1.8.tgz";
+      sha1 = "551b8a6015093701bcacc964916b1ae06578f37b";
     };
     deps = {
       "busboy-0.2.9" = self.by-version."busboy"."0.2.9";
@@ -18179,12 +24016,17 @@
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."multiparty"."2.2.0" =
     self.by-version."multiparty"."2.2.0";
   by-version."multiparty"."2.2.0" = self.buildNodePackage {
     name = "multiparty-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
@@ -18195,12 +24037,17 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."multiparty"."3.3.2" =
     self.by-version."multiparty"."3.3.2";
   by-version."multiparty"."3.3.2" = self.buildNodePackage {
     name = "multiparty-3.3.2";
+    version = "3.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
@@ -18211,7 +24058,11 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."multiparty"."~3.3.2" =
     self.by-version."multiparty"."3.3.2";
@@ -18219,6 +24070,7 @@
     self.by-version."multipipe"."0.1.2";
   by-version."multipipe"."0.1.2" = self.buildNodePackage {
     name = "multipipe-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
@@ -18228,12 +24080,17 @@
     deps = {
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."muri"."0.3.1" =
     self.by-version."muri"."0.3.1";
   by-version."muri"."0.3.1" = self.buildNodePackage {
     name = "muri-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
@@ -18242,12 +24099,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mustache"."1.0.0" =
+    self.by-version."mustache"."1.0.0";
+  by-version."mustache"."1.0.0" = self.buildNodePackage {
+    name = "mustache-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mustache/-/mustache-1.0.0.tgz";
+      name = "mustache-1.0.0.tgz";
+      sha1 = "8f5b8f68041dbead10997e0ba1d024771a03e15a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mutate.js"."^0.2.0" =
     self.by-version."mutate.js"."0.2.0";
   by-version."mutate.js"."0.2.0" = self.buildNodePackage {
     name = "mutate.js-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz";
@@ -18256,12 +24137,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mute-stream"."0.0.4" =
     self.by-version."mute-stream"."0.0.4";
   by-version."mute-stream"."0.0.4" = self.buildNodePackage {
     name = "mute-stream-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
@@ -18270,7 +24156,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mute-stream"."~0.0.4" =
     self.by-version."mute-stream"."0.0.4";
@@ -18278,6 +24168,7 @@
     self.by-version."mv"."0.0.5";
   by-version."mv"."0.0.5" = self.buildNodePackage {
     name = "mv-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
@@ -18286,12 +24177,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mv"."~2" =
     self.by-version."mv"."2.0.3";
   by-version."mv"."2.0.3" = self.buildNodePackage {
     name = "mv-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
@@ -18303,12 +24199,17 @@
       "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mz"."1" =
     self.by-version."mz"."1.3.0";
   by-version."mz"."1.3.0" = self.buildNodePackage {
     name = "mz-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mz/-/mz-1.3.0.tgz";
@@ -18320,54 +24221,17 @@
       "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
       "thenify-all-1.6.0" = self.by-version."thenify-all"."1.6.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."nan"."1.1.2" =
-    self.by-version."nan"."1.1.2";
-  by-version."nan"."1.1.2" = self.buildNodePackage {
-    name = "nan-1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
-      name = "nan-1.1.2.tgz";
-      sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."nan"."1.3.0" =
-    self.by-version."nan"."1.3.0";
-  by-version."nan"."1.3.0" = self.buildNodePackage {
-    name = "nan-1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
-      name = "nan-1.3.0.tgz";
-      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
-  by-spec."nan"."1.5.0" =
-    self.by-version."nan"."1.5.0";
-  by-version."nan"."1.5.0" = self.buildNodePackage {
-    name = "nan-1.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
-      name = "nan-1.5.0.tgz";
-      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
-  by-spec."nan"."1.6.2" =
+  by-spec."nan"."*" =
     self.by-version."nan"."1.6.2";
   by-version."nan"."1.6.2" = self.buildNodePackage {
     name = "nan-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz";
@@ -18376,8 +24240,71 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."nan"."1.1.2" =
+    self.by-version."nan"."1.1.2";
+  by-version."nan"."1.1.2" = self.buildNodePackage {
+    name = "nan-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
+      name = "nan-1.1.2.tgz";
+      sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."1.3.0" =
+    self.by-version."nan"."1.3.0";
+  by-version."nan"."1.3.0" = self.buildNodePackage {
+    name = "nan-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
+      name = "nan-1.3.0.tgz";
+      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."1.5.0" =
+    self.by-version."nan"."1.5.0";
+  by-version."nan"."1.5.0" = self.buildNodePackage {
+    name = "nan-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
+      name = "nan-1.5.0.tgz";
+      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."1.6.2" =
+    self.by-version."nan"."1.6.2";
   by-spec."nan"."1.6.x" =
     self.by-version."nan"."1.6.2";
   by-spec."nan".">=1.3.0" =
@@ -18392,6 +24319,7 @@
     self.by-version."nan"."0.3.2";
   by-version."nan"."0.3.2" = self.buildNodePackage {
     name = "nan-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
@@ -18400,12 +24328,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nan"."~0.6.0" =
     self.by-version."nan"."0.6.0";
   by-version."nan"."0.6.0" = self.buildNodePackage {
     name = "nan-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
@@ -18414,12 +24347,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nan"."~0.7.0" =
     self.by-version."nan"."0.7.1";
   by-version."nan"."0.7.1" = self.buildNodePackage {
     name = "nan-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz";
@@ -18428,12 +24366,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nan"."~1.0.0" =
     self.by-version."nan"."1.0.0";
   by-version."nan"."1.0.0" = self.buildNodePackage {
     name = "nan-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
@@ -18442,12 +24385,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nan"."~1.2.0" =
     self.by-version."nan"."1.2.0";
   by-version."nan"."1.2.0" = self.buildNodePackage {
     name = "nan-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
@@ -18456,12 +24404,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."nan"."~1.3.0" =
+    self.by-version."nan"."1.3.0";
   by-spec."nan"."~1.5.0" =
     self.by-version."nan"."1.5.3";
   by-version."nan"."1.5.3" = self.buildNodePackage {
     name = "nan-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz";
@@ -18470,7 +24425,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nan"."~1.5.3" =
     self.by-version."nan"."1.5.3";
@@ -18480,6 +24439,7 @@
     self.by-version."native-buffer-browserify"."2.0.17";
   by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage {
     name = "native-buffer-browserify-2.0.17";
+    version = "2.0.17";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
@@ -18490,7 +24450,11 @@
       "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
       "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."native-buffer-browserify"."~2.0.15" =
     self.by-version."native-buffer-browserify"."2.0.17";
@@ -18498,6 +24462,7 @@
     self.by-version."native-dns"."0.6.1";
   by-version."native-dns"."0.6.1" = self.buildNodePackage {
     name = "native-dns-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-dns/-/native-dns-0.6.1.tgz";
@@ -18509,12 +24474,17 @@
       "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
       "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."native-dns-cache".">= 0.0.1" =
     self.by-version."native-dns-cache"."0.0.2";
   by-version."native-dns-cache"."0.0.2" = self.buildNodePackage {
     name = "native-dns-cache-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-dns-cache/-/native-dns-cache-0.0.2.tgz";
@@ -18525,12 +24495,17 @@
       "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3";
       "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."native-dns-packet".">= 0.0.1" =
     self.by-version."native-dns-packet"."0.1.1";
   by-version."native-dns-packet"."0.1.1" = self.buildNodePackage {
     name = "native-dns-packet-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
@@ -18541,7 +24516,11 @@
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
       "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."native-dns-packet".">= 0.0.4" =
     self.by-version."native-dns-packet"."0.1.1";
@@ -18549,6 +24528,7 @@
     self.by-version."native-or-bluebird"."1.2.0";
   by-version."native-or-bluebird"."1.2.0" = self.buildNodePackage {
     name = "native-or-bluebird-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz";
@@ -18557,12 +24537,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."native-or-bluebird"."~1.1.2" =
     self.by-version."native-or-bluebird"."1.1.2";
   by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage {
     name = "native-or-bluebird-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz";
@@ -18571,12 +24556,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."natural"."^0.2.0" =
     self.by-version."natural"."0.2.0";
   by-version."natural"."0.2.0" = self.buildNodePackage {
     name = "natural-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/natural/-/natural-0.2.0.tgz";
@@ -18586,14 +24576,19 @@
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
       "apparatus-0.0.8" = self.by-version."apparatus"."0.0.8";
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nconf"."*" =
     self.by-version."nconf"."0.7.1";
   by-version."nconf"."0.7.1" = self.buildNodePackage {
     name = "nconf-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
@@ -18605,13 +24600,18 @@
       "ini-1.3.3" = self.by-version."ini"."1.3.3";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "nconf" = self.by-version."nconf"."0.7.1";
   by-spec."nconf"."0.6.9" =
     self.by-version."nconf"."0.6.9";
   by-version."nconf"."0.6.9" = self.buildNodePackage {
     name = "nconf-0.6.9";
+    version = "0.6.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
@@ -18623,7 +24623,11 @@
       "ini-1.3.3" = self.by-version."ini"."1.3.3";
       "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nconf"."~0.6.9" =
     self.by-version."nconf"."0.6.9";
@@ -18631,6 +24635,7 @@
     self.by-version."ncp"."0.2.7";
   by-version."ncp"."0.2.7" = self.buildNodePackage {
     name = "ncp-0.2.7";
+    version = "0.2.7";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
@@ -18639,12 +24644,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ncp"."0.4.x" =
     self.by-version."ncp"."0.4.2";
   by-version."ncp"."0.4.2" = self.buildNodePackage {
     name = "ncp-0.4.2";
+    version = "0.4.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
@@ -18653,7 +24663,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ncp"."~0.4.2" =
     self.by-version."ncp"."0.4.2";
@@ -18661,6 +24675,7 @@
     self.by-version."ncp"."0.6.0";
   by-version."ncp"."0.6.0" = self.buildNodePackage {
     name = "ncp-0.6.0";
+    version = "0.6.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
@@ -18669,12 +24684,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.2.5" =
     self.by-version."negotiator"."0.2.5";
   by-version."negotiator"."0.2.5" = self.buildNodePackage {
     name = "negotiator-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
@@ -18683,12 +24703,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.3.0" =
     self.by-version."negotiator"."0.3.0";
   by-version."negotiator"."0.3.0" = self.buildNodePackage {
     name = "negotiator-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
@@ -18697,12 +24722,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.4.2" =
     self.by-version."negotiator"."0.4.2";
   by-version."negotiator"."0.4.2" = self.buildNodePackage {
     name = "negotiator-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
@@ -18711,12 +24741,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.4.7" =
     self.by-version."negotiator"."0.4.7";
   by-version."negotiator"."0.4.7" = self.buildNodePackage {
     name = "negotiator-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
@@ -18725,12 +24760,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.4.9" =
     self.by-version."negotiator"."0.4.9";
   by-version."negotiator"."0.4.9" = self.buildNodePackage {
     name = "negotiator-0.4.9";
+    version = "0.4.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
@@ -18739,12 +24779,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."negotiator"."0.5.1" =
     self.by-version."negotiator"."0.5.1";
   by-version."negotiator"."0.5.1" = self.buildNodePackage {
     name = "negotiator-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz";
@@ -18753,12 +24798,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
   by-version."net-ping"."1.1.7" = self.buildNodePackage {
     name = "net-ping-1.1.7";
+    version = "1.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
@@ -18768,12 +24818,17 @@
     deps = {
       "raw-socket-1.2.2" = self.by-version."raw-socket"."1.2.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."netmask"."~1.0.4" =
     self.by-version."netmask"."1.0.5";
   by-version."netmask"."1.0.5" = self.buildNodePackage {
     name = "netmask-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz";
@@ -18782,26 +24837,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."network-address"."0.0.4" =
-    self.by-version."network-address"."0.0.4";
-  by-version."network-address"."0.0.4" = self.buildNodePackage {
-    name = "network-address-0.0.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/network-address/-/network-address-0.0.4.tgz";
-      name = "network-address-0.0.4.tgz";
-      sha1 = "4dc7a8400a9fbac6b845a2c7bf3f06bcf9b2eedf";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."network-address"."0.0.5" =
     self.by-version."network-address"."0.0.5";
   by-version."network-address"."0.0.5" = self.buildNodePackage {
     name = "network-address-0.0.5";
+    version = "0.0.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz";
@@ -18810,12 +24856,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."next-tick"."~0.2.2" =
     self.by-version."next-tick"."0.2.2";
   by-version."next-tick"."0.2.2" = self.buildNodePackage {
     name = "next-tick-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz";
@@ -18824,12 +24875,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nib"."*" =
     self.by-version."nib"."1.1.0";
   by-version."nib"."1.1.0" = self.buildNodePackage {
     name = "nib-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nib/-/nib-1.1.0.tgz";
@@ -18839,13 +24895,18 @@
     deps = {
       "stylus-0.49.3" = self.by-version."stylus"."0.49.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "nib" = self.by-version."nib"."1.1.0";
   by-spec."nib"."0.5.0" =
     self.by-version."nib"."0.5.0";
   by-version."nib"."0.5.0" = self.buildNodePackage {
     name = "nib-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
@@ -18854,12 +24915,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nijs"."*" =
     self.by-version."nijs"."0.0.22";
   by-version."nijs"."0.0.22" = self.buildNodePackage {
     name = "nijs-0.0.22";
+    version = "0.0.22";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz";
@@ -18870,42 +24936,50 @@
       "optparse-1.0.5" = self.by-version."optparse"."1.0.5";
       "slasp-0.0.4" = self.by-version."slasp"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "nijs" = self.by-version."nijs"."0.0.22";
-  by-spec."node-appc"."0.2.14" =
-    self.by-version."node-appc"."0.2.14";
-  by-version."node-appc"."0.2.14" = self.buildNodePackage {
-    name = "node-appc-0.2.14";
+  by-spec."node-appc"."0.2.24" =
+    self.by-version."node-appc"."0.2.24";
+  by-version."node-appc"."0.2.24" = self.buildNodePackage {
+    name = "node-appc-0.2.24";
+    version = "0.2.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.14.tgz";
-      name = "node-appc-0.2.14.tgz";
-      sha1 = "74f20eca49ebf940799fac44bcb224321582cf98";
+      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.24.tgz";
+      name = "node-appc-0.2.24.tgz";
+      sha1 = "09bcc9a887bda6a9f26bc6b597094dff1ccaf0aa";
     };
     deps = {
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
-      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "dox-0.4.6" = self.by-version."dox"."0.4.6";
-      "jade-0.35.0" = self.by-version."jade"."0.35.0";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "request-2.27.0" = self.by-version."request"."2.27.0";
-      "semver-2.1.0" = self.by-version."semver"."2.1.0";
+      "request-2.40.0" = self.by-version."request"."2.40.0";
+      "semver-3.0.1" = self.by-version."semver"."3.0.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
-      "temp-0.6.0" = self.by-version."temp"."0.6.0";
+      "temp-0.8.1" = self.by-version."temp"."0.8.1";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
-      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-craigslist"."^0.1.7" =
     self.by-version."node-craigslist"."0.1.7";
   by-version."node-craigslist"."0.1.7" = self.buildNodePackage {
     name = "node-craigslist-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.7.tgz";
@@ -18915,12 +24989,17 @@
     deps = {
       "cheerio-0.17.0" = self.by-version."cheerio"."0.17.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-df"."^0.1.1" =
     self.by-version."node-df"."0.1.1";
   by-version."node-df"."0.1.1" = self.buildNodePackage {
     name = "node-df-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz";
@@ -18928,14 +25007,19 @@
       sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea";
     };
     deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-expat"."*" =
     self.by-version."node-expat"."2.3.6";
   by-version."node-expat"."2.3.6" = self.buildNodePackage {
     name = "node-expat-2.3.6";
+    version = "2.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.6.tgz";
@@ -18948,17 +25032,24 @@
       "iconv-2.1.6" = self.by-version."iconv"."2.1.6";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-expat" = self.by-version."node-expat"."2.3.6";
   by-spec."node-expat".">=1.4.1" =
     self.by-version."node-expat"."2.3.6";
   by-spec."node-expat"."^2.3.0" =
     self.by-version."node-expat"."2.3.6";
+  by-spec."node-expat"."^2.3.6" =
+    self.by-version."node-expat"."2.3.6";
   by-spec."node-expat"."~2.1.4" =
     self.by-version."node-expat"."2.1.4";
   by-version."node-expat"."2.1.4" = self.buildNodePackage {
     name = "node-expat-2.1.4";
+    version = "2.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
@@ -18968,7 +25059,11 @@
     deps = {
       "nan-0.6.0" = self.by-version."nan"."0.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-expat"."~2.3.0" =
     self.by-version."node-expat"."2.3.6";
@@ -18978,6 +25073,7 @@
     self.by-version."node-fs"."0.1.7";
   by-version."node-fs"."0.1.7" = self.buildNodePackage {
     name = "node-fs-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz";
@@ -18986,12 +25082,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ "linux" "darwin" "freebsd" "win32" "smartos" "sunos" ];
+    cpu = [ ];
   };
   by-spec."node-gyp"."*" =
     self.by-version."node-gyp"."1.0.2";
   by-version."node-gyp"."1.0.2" = self.buildNodePackage {
     name = "node-gyp-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz";
@@ -19013,46 +25114,117 @@
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-gyp" = self.by-version."node-gyp"."1.0.2";
   by-spec."node-gyp"."~1.0.1" =
     self.by-version."node-gyp"."1.0.2";
   by-spec."node-gyp"."~1.0.2" =
     self.by-version."node-gyp"."1.0.2";
-  by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.8.3";
-  by-version."node-inspector"."0.8.3" = self.buildNodePackage {
-    name = "node-inspector-0.8.3";
-    bin = true;
+  by-spec."node-icu-charset-detector"."0.0.7" =
+    self.by-version."node-icu-charset-detector"."0.0.7";
+  by-version."node-icu-charset-detector"."0.0.7" = self.buildNodePackage {
+    name = "node-icu-charset-detector-0.0.7";
+    version = "0.0.7";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.3.tgz";
-      name = "node-inspector-0.8.3.tgz";
-      sha1 = "2eac57771973c6eb49100ef4c9caa6ae0bcd8911";
+      url = "http://registry.npmjs.org/node-icu-charset-detector/-/node-icu-charset-detector-0.0.7.tgz";
+      name = "node-icu-charset-detector-0.0.7.tgz";
+      sha1 = "832867d4e70cc666a616339ff6637bad039c7d1f";
     };
     deps = {
-      "express-4.11.2" = self.by-version."express"."4.11.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-inspector"."*" =
+    self.by-version."node-inspector"."0.9.0";
+  by-version."node-inspector"."0.9.0" = self.buildNodePackage {
+    name = "node-inspector-0.9.0";
+    version = "0.9.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.9.0.tgz";
+      name = "node-inspector-0.9.0.tgz";
+      sha1 = "af3bc431f1e2a2814fe5d790d44b09f145e2f950";
+    };
+    deps = {
+      "express-4.12.0" = self.by-version."express"."4.12.0";
       "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "rc-0.5.5" = self.by-version."rc"."0.5.5";
       "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "ws-0.4.32" = self.by-version."ws"."0.4.32";
-      "opener-1.4.0" = self.by-version."opener"."1.4.0";
+      "biased-opener-0.2.2" = self.by-version."biased-opener"."0.2.2";
       "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
       "which-1.0.8" = self.by-version."which"."1.0.8";
       "v8-debug-0.3.5" = self.by-version."v8-debug"."0.3.5";
-      "v8-profiler-5.2.3" = self.by-version."v8-profiler"."5.2.3";
+      "v8-profiler-5.2.4" = self.by-version."v8-profiler"."5.2.4";
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "node-inspector" = self.by-version."node-inspector"."0.9.0";
+  by-spec."node-libs-browser"."~0.4.0" =
+    self.by-version."node-libs-browser"."0.4.1";
+  by-version."node-libs-browser"."0.4.1" = self.buildNodePackage {
+    name = "node-libs-browser-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.4.1.tgz";
+      name = "node-libs-browser-0.4.1.tgz";
+      sha1 = "9d063c7f3bdc2eab8d184578b5bcb5785e63ad3a";
+    };
+    deps = {
+      "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
+      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
+      "crypto-browserify-3.3.0" = self.by-version."crypto-browserify"."3.3.0";
+      "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
+      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
+      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
+      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
+      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
+      "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
+      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
+      "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
+      "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0";
+      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+      "events-1.0.2" = self.by-version."events"."1.0.2";
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "buffer-2.8.2" = self.by-version."buffer"."2.8.2";
+      "url-0.10.2" = self.by-version."url"."0.10.2";
+      "process-0.8.0" = self.by-version."process"."0.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.8.3";
   by-spec."node-options"."0.0.6" =
     self.by-version."node-options"."0.0.6";
   by-version."node-options"."0.0.6" = self.buildNodePackage {
     name = "node-options-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-options/-/node-options-0.0.6.tgz";
@@ -19061,12 +25233,45 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."node-pre-gyp"."^0.6.0" =
+  by-spec."node-pre-gyp"."0.5.x" =
+    self.by-version."node-pre-gyp"."0.5.31";
+  by-version."node-pre-gyp"."0.5.31" = self.buildNodePackage {
+    name = "node-pre-gyp-0.5.31";
+    version = "0.5.31";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz";
+      name = "node-pre-gyp-0.5.31.tgz";
+      sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba";
+    };
+    deps = {
+      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "semver-4.1.1" = self.by-version."semver"."4.1.1";
+      "tar-1.0.3" = self.by-version."tar"."1.0.3";
+      "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "rc-0.5.5" = self.by-version."rc"."0.5.5";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-pre-gyp"."^0.6.2" =
     self.by-version."node-pre-gyp"."0.6.4";
   by-version."node-pre-gyp"."0.6.4" = self.buildNodePackage {
     name = "node-pre-gyp-0.6.4";
+    version = "0.6.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz";
@@ -19084,14 +25289,19 @@
       "rc-0.6.0" = self.by-version."rc"."0.6.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."node-pre-gyp"."^0.6.2" =
+  by-spec."node-pre-gyp"."^0.6.4" =
     self.by-version."node-pre-gyp"."0.6.4";
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.2.2";
   by-version."node-protobuf"."1.2.2" = self.buildNodePackage {
     name = "node-protobuf-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz";
@@ -19102,30 +25312,71 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-protobuf" = self.by-version."node-protobuf"."1.2.2";
-  by-spec."node-ssdp"."^2.0.1" =
-    self.by-version."node-ssdp"."2.0.1";
-  by-version."node-ssdp"."2.0.1" = self.buildNodePackage {
-    name = "node-ssdp-2.0.1";
+  by-spec."node-red"."*" =
+    self.by-version."node-red"."0.10.2";
+  by-version."node-red"."0.10.2" = self.buildNodePackage {
+    name = "node-red-0.10.2";
+    version = "0.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-ssdp/-/node-ssdp-2.0.1.tgz";
-      name = "node-ssdp-2.0.1.tgz";
-      sha1 = "9d78eb7bba74305585ec20d929cd1f0c8b436883";
+      url = "http://registry.npmjs.org/node-red/-/node-red-0.10.2.tgz";
+      name = "node-red-0.10.2.tgz";
+      sha1 = "b0ce6fc3786754e04378e6b0bb6aa4b9b9022c33";
     };
     deps = {
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
-      "bunyan-prettystream-0.1.3" = self.by-version."bunyan-prettystream"."0.1.3";
-      "bunyan-0.22.3" = self.by-version."bunyan"."0.22.3";
+      "express-3.17.2" = self.by-version."express"."3.17.2";
+      "when-3.7.2" = self.by-version."when"."3.7.2";
+      "bcryptjs-2.1.0" = self.by-version."bcryptjs"."2.1.0";
+      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+      "mqtt-0.3.13" = self.by-version."mqtt"."0.3.13";
+      "ws-0.7.1" = self.by-version."ws"."0.7.1";
+      "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3";
+      "clone-0.2.0" = self.by-version."clone"."0.2.0";
+      "mustache-1.0.0" = self.by-version."mustache"."1.0.0";
+      "cron-1.0.6" = self.by-version."cron"."1.0.6";
+      "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2";
+      "twitter-ng-0.6.2" = self.by-version."twitter-ng"."0.6.2";
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+      "sentiment-0.2.3" = self.by-version."sentiment"."0.2.3";
+      "irc-0.3.9" = self.by-version."irc"."0.3.9";
+      "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
+      "cors-2.5.3" = self.by-version."cors"."2.5.3";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
+      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "nodemailer-1.3.0" = self.by-version."nodemailer"."1.3.0";
+      "imap-0.8.14" = self.by-version."imap"."0.8.14";
+      "request-2.42.0" = self.by-version."request"."2.42.0";
+      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+      "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
+      "serialport-1.4.10" = self.by-version."serialport"."1.4.10";
+      "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2";
+      "fs.notify-0.0.4" = self.by-version."fs.notify"."0.0.4";
+      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "passport-http-bearer-1.0.1" = self.by-version."passport-http-bearer"."1.0.1";
+      "passport-oauth2-client-password-0.1.2" = self.by-version."passport-oauth2-client-password"."0.1.2";
+      "oauth2orize-1.0.1" = self.by-version."oauth2orize"."1.0.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  "node-red" = self.by-version."node-red"."0.10.2";
   by-spec."node-stringprep"."*" =
     self.by-version."node-stringprep"."0.7.0";
   by-version."node-stringprep"."0.7.0" = self.buildNodePackage {
     name = "node-stringprep-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.7.0.tgz";
@@ -19137,13 +25388,18 @@
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-stringprep" = self.by-version."node-stringprep"."0.7.0";
   by-spec."node-stringprep"."^0.5.2" =
     self.by-version."node-stringprep"."0.5.4";
   by-version."node-stringprep"."0.5.4" = self.buildNodePackage {
     name = "node-stringprep-0.5.4";
+    version = "0.5.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz";
@@ -19155,7 +25411,11 @@
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-stringprep"."^0.7.0" =
     self.by-version."node-stringprep"."0.7.0";
@@ -19163,6 +25423,7 @@
     self.by-version."node-stringprep"."0.2.3";
   by-version."node-stringprep"."0.2.3" = self.buildNodePackage {
     name = "node-stringprep-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz";
@@ -19173,12 +25434,17 @@
       "nan-0.7.1" = self.by-version."nan"."0.7.1";
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-stringprep"."~0.6.0" =
     self.by-version."node-stringprep"."0.6.2";
   by-version."node-stringprep"."0.6.2" = self.buildNodePackage {
     name = "node-stringprep-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz";
@@ -19190,7 +25456,11 @@
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-stringprep"."~0.x" =
     self.by-version."node-stringprep"."0.7.0";
@@ -19198,6 +25468,7 @@
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = self.buildNodePackage {
     name = "node-swt-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
@@ -19206,12 +25477,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-syslog"."1.1.7" =
     self.by-version."node-syslog"."1.1.7";
   by-version."node-syslog"."1.1.7" = self.buildNodePackage {
     name = "node-syslog-1.1.7";
+    version = "1.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
@@ -19220,12 +25496,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
     self.by-version."node-uptime"."3.2.0";
   by-version."node-uptime"."3.2.0" = self.buildNodePackage {
     name = "node-uptime-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
       url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
@@ -19248,13 +25529,18 @@
       "net-ping-1.1.7" = self.by-version."net-ping"."1.1.7";
       "js-yaml-2.1.0" = self.by-version."js-yaml"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-uptime" = self.by-version."node-uptime"."3.2.0";
   by-spec."node-uuid"."*" =
     self.by-version."node-uuid"."1.4.2";
   by-version."node-uuid"."1.4.2" = self.buildNodePackage {
     name = "node-uuid-1.4.2";
+    version = "1.4.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz";
@@ -19263,13 +25549,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-uuid" = self.by-version."node-uuid"."1.4.2";
   by-spec."node-uuid"."1.3.3" =
     self.by-version."node-uuid"."1.3.3";
   by-version."node-uuid"."1.3.3" = self.buildNodePackage {
     name = "node-uuid-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
@@ -19278,12 +25569,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uuid"."1.4.0" =
     self.by-version."node-uuid"."1.4.0";
   by-version."node-uuid"."1.4.0" = self.buildNodePackage {
     name = "node-uuid-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
@@ -19292,12 +25588,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uuid"."1.4.1" =
     self.by-version."node-uuid"."1.4.1";
   by-version."node-uuid"."1.4.1" = self.buildNodePackage {
     name = "node-uuid-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
@@ -19306,7 +25607,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uuid"."^1.3.3" =
     self.by-version."node-uuid"."1.4.2";
@@ -19322,6 +25627,7 @@
     self.by-version."node-wsfederation"."0.1.1";
   by-version."node-wsfederation"."0.1.1" = self.buildNodePackage {
     name = "node-wsfederation-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
@@ -19331,12 +25637,17 @@
     deps = {
       "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp"."*" =
     self.by-version."node-xmpp"."1.0.0-alpha2";
   by-version."node-xmpp"."1.0.0-alpha2" = self.buildNodePackage {
     name = "node-xmpp-1.0.0-alpha2";
+    version = "1.0.0-alpha2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz";
@@ -19348,7 +25659,7 @@
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2";
+      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
       "browserify-3.19.1" = self.by-version."browserify"."3.19.1";
       "brfs-0.0.8" = self.by-version."brfs"."0.0.8";
       "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
@@ -19356,13 +25667,18 @@
       "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11";
       "node-xmpp-core-1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2";
   by-spec."node-xmpp"."~0.15.0" =
     self.by-version."node-xmpp"."0.15.0";
   by-version."node-xmpp"."0.15.0" = self.buildNodePackage {
     name = "node-xmpp-0.15.0";
+    version = "0.15.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz";
@@ -19374,7 +25690,7 @@
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
       "request-2.53.0" = self.by-version."request"."2.53.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2";
+      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
       "browserify-3.19.1" = self.by-version."browserify"."3.19.1";
       "brfs-0.0.8" = self.by-version."brfs"."0.0.8";
       "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0";
@@ -19382,12 +25698,17 @@
       "node-xmpp-server-0.6.0" = self.by-version."node-xmpp-server"."0.6.0";
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-client"."*" =
     self.by-version."node-xmpp-client"."1.0.0-alpha9";
   by-version."node-xmpp-client"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-client-1.0.0-alpha9";
+    version = "1.0.0-alpha9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz";
@@ -19402,18 +25723,23 @@
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9";
   by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" =
     self.by-version."node-xmpp-client"."1.0.0-alpha20";
   by-version."node-xmpp-client"."1.0.0-alpha20" = self.buildNodePackage {
     name = "node-xmpp-client-1.0.0-alpha20";
+    version = "1.0.0-alpha20";
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-client.git";
-      rev = "68bd565dc08da50e2806533a1f616bca6fc853fd";
-      sha256 = "9881cf6999293783d5c0459e53ecbf9adf5bfdbcf00cf668b67368ddd1aa4caf";
+      rev = "3be5ccc42a13377edad060b39980de70b0dd981a";
+      sha256 = "1e0cba0ec6b58a73533d723e9f5100676229d27c3fcb0799cc64bf79f97c687f";
     };
     deps = {
       "request-2.48.0" = self.by-version."request"."2.48.0";
@@ -19423,12 +25749,17 @@
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-client"."~0.4.0" =
     self.by-version."node-xmpp-client"."0.4.0";
   by-version."node-xmpp-client"."0.4.0" = self.buildNodePackage {
     name = "node-xmpp-client-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz";
@@ -19442,12 +25773,17 @@
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-component"."*" =
     self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-version."node-xmpp-component"."1.0.0-alpha1" = self.buildNodePackage {
     name = "node-xmpp-component-1.0.0-alpha1";
+    version = "1.0.0-alpha1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz";
@@ -19458,7 +25794,11 @@
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
       "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" =
@@ -19467,6 +25807,7 @@
     self.by-version."node-xmpp-component"."0.3.0";
   by-version."node-xmpp-component"."0.3.0" = self.buildNodePackage {
     name = "node-xmpp-component-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz";
@@ -19477,12 +25818,17 @@
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-core"."*" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-version."node-xmpp-core"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha9";
+    version = "1.0.0-alpha9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz";
@@ -19496,13 +25842,18 @@
       "ltx-0.5.2" = self.by-version."ltx"."0.5.2";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-core" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."1.0.0-alpha1" =
     self.by-version."node-xmpp-core"."1.0.0-alpha1";
   by-version."node-xmpp-core"."1.0.0-alpha1" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha1";
+    version = "1.0.0-alpha1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz";
@@ -19516,7 +25867,11 @@
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-core"."^1.0.0-alpha13" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
@@ -19528,6 +25883,7 @@
     self.by-version."node-xmpp-core"."1.0.0-alpha13";
   by-version."node-xmpp-core"."1.0.0-alpha13" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha13";
+    version = "1.0.0-alpha13";
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-core.git";
@@ -19541,12 +25897,17 @@
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-core"."~0.5.0" =
     self.by-version."node-xmpp-core"."0.5.0";
   by-version."node-xmpp-core"."0.5.0" = self.buildNodePackage {
     name = "node-xmpp-core-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz";
@@ -19558,7 +25919,11 @@
       "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-core"."~1.0.0-alpha10" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
@@ -19566,6 +25931,7 @@
     self.by-version."node-xmpp-joap"."0.0.17";
   by-version."node-xmpp-joap"."0.0.17" = self.buildNodePackage {
     name = "node-xmpp-joap-0.0.17";
+    version = "0.0.17";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz";
@@ -19581,13 +25947,18 @@
       "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.17";
   by-spec."node-xmpp-server"."*" =
     self.by-version."node-xmpp-server"."1.0.0-alpha9";
   by-version."node-xmpp-server"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-server-1.0.0-alpha9";
+    version = "1.0.0-alpha9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz";
@@ -19599,13 +25970,18 @@
       "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9";
   by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" =
     self.by-version."node-xmpp-server"."1.0.0-alpha11";
   by-version."node-xmpp-server"."1.0.0-alpha11" = self.buildNodePackage {
     name = "node-xmpp-server-1.0.0-alpha11";
+    version = "1.0.0-alpha11";
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-server.git";
@@ -19618,12 +25994,17 @@
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "ws-0.7.1" = self.by-version."ws"."0.7.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-server"."~0.6.0" =
     self.by-version."node-xmpp-server"."0.6.0";
   by-version."node-xmpp-server"."0.6.0" = self.buildNodePackage {
     name = "node-xmpp-server-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz";
@@ -19635,12 +26016,17 @@
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
       "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-xmpp-serviceadmin"."*" =
     self.by-version."node-xmpp-serviceadmin"."0.1.6";
   by-version."node-xmpp-serviceadmin"."0.1.6" = self.buildNodePackage {
     name = "node-xmpp-serviceadmin-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz";
@@ -19650,13 +26036,18 @@
     deps = {
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.1.6";
   by-spec."node.extend"."1.0.0" =
     self.by-version."node.extend"."1.0.0";
   by-version."node.extend"."1.0.0" = self.buildNodePackage {
     name = "node.extend-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
@@ -19665,12 +26056,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nodemailer"."0.3.35" =
     self.by-version."nodemailer"."0.3.35";
   by-version."nodemailer"."0.3.35" = self.buildNodePackage {
     name = "nodemailer-0.3.35";
+    version = "0.3.35";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
@@ -19682,12 +26078,17 @@
       "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nodemailer"."0.7.1" =
     self.by-version."nodemailer"."0.7.1";
   by-version."nodemailer"."0.7.1" = self.buildNodePackage {
     name = "nodemailer-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.7.1.tgz";
@@ -19701,14 +26102,103 @@
       "he-0.3.6" = self.by-version."he"."0.3.6";
       "public-address-0.1.1" = self.by-version."public-address"."0.1.1";
       "aws-sdk-2.0.5" = self.by-version."aws-sdk"."2.0.5";
+    };
+    optionalDependencies = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer"."1.3.0" =
+    self.by-version."nodemailer"."1.3.0";
+  by-version."nodemailer"."1.3.0" = self.buildNodePackage {
+    name = "nodemailer-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-1.3.0.tgz";
+      name = "nodemailer-1.3.0.tgz";
+      sha1 = "a6e4c507b2f776a03d46e9be8d40b5be916f290a";
+    };
+    deps = {
+      "buildmail-1.2.0" = self.by-version."buildmail"."1.2.0";
+      "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0";
+      "libmime-0.1.7" = self.by-version."libmime"."0.1.7";
+      "nodemailer-direct-transport-1.0.1" = self.by-version."nodemailer-direct-transport"."1.0.1";
+      "nodemailer-smtp-transport-0.1.13" = self.by-version."nodemailer-smtp-transport"."0.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer-direct-transport"."^1.0.0" =
+    self.by-version."nodemailer-direct-transport"."1.0.1";
+  by-version."nodemailer-direct-transport"."1.0.1" = self.buildNodePackage {
+    name = "nodemailer-direct-transport-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.1.tgz";
+      name = "nodemailer-direct-transport-1.0.1.tgz";
+      sha1 = "72e41f5a419f774ba07f7f3506d1dacd1b564c2b";
+    };
+    deps = {
+      "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer-smtp-transport"."^0.1.12" =
+    self.by-version."nodemailer-smtp-transport"."0.1.13";
+  by-version."nodemailer-smtp-transport"."0.1.13" = self.buildNodePackage {
+    name = "nodemailer-smtp-transport-0.1.13";
+    version = "0.1.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-0.1.13.tgz";
+      name = "nodemailer-smtp-transport-0.1.13.tgz";
+      sha1 = "f8d1babfd5221aaa1308fd36ab7945a2f7081476";
+    };
+    deps = {
+      "nodemailer-wellknown-0.1.5" = self.by-version."nodemailer-wellknown"."0.1.5";
+      "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer-wellknown"."^0.1.1" =
+    self.by-version."nodemailer-wellknown"."0.1.5";
+  by-version."nodemailer-wellknown"."0.1.5" = self.buildNodePackage {
+    name = "nodemailer-wellknown-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.5.tgz";
+      name = "nodemailer-wellknown-0.1.5.tgz";
+      sha1 = "1e467a2f7132ec30273b45f1ae300dd1193dd035";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nodemon"."*" =
     self.by-version."nodemon"."1.3.7";
   by-version."nodemon"."1.3.7" = self.buildNodePackage {
     name = "nodemon-1.3.7";
+    version = "1.3.7";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.7.tgz";
@@ -19721,13 +26211,18 @@
       "touch-0.0.3" = self.by-version."touch"."0.0.3";
       "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "nodemon" = self.by-version."nodemon"."1.3.7";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = self.buildNodePackage {
     name = "nomnom-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
@@ -19738,12 +26233,17 @@
       "colors-0.5.1" = self.by-version."colors"."0.5.1";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."2" =
     self.by-version."nopt"."2.2.1";
   by-version."nopt"."2.2.1" = self.buildNodePackage {
     name = "nopt-2.2.1";
+    version = "2.2.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
@@ -19753,12 +26253,17 @@
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."2 || 3" =
     self.by-version."nopt"."3.0.1";
   by-version."nopt"."3.0.1" = self.buildNodePackage {
     name = "nopt-3.0.1";
+    version = "3.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
@@ -19768,12 +26273,17 @@
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."2.0.0" =
     self.by-version."nopt"."2.0.0";
   by-version."nopt"."2.0.0" = self.buildNodePackage {
     name = "nopt-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
@@ -19783,12 +26293,17 @@
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."2.1.1" =
     self.by-version."nopt"."2.1.1";
   by-version."nopt"."2.1.1" = self.buildNodePackage {
     name = "nopt-2.1.1";
+    version = "2.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
@@ -19798,7 +26313,11 @@
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."3.0.1" =
     self.by-version."nopt"."3.0.1";
@@ -19808,6 +26327,7 @@
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = self.buildNodePackage {
     name = "nopt-1.0.10";
+    version = "1.0.10";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
@@ -19817,7 +26337,11 @@
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nopt"."~2" =
     self.by-version."nopt"."2.2.1";
@@ -19831,6 +26355,7 @@
     self.by-version."normalize-git-url"."1.0.0";
   by-version."normalize-git-url"."1.0.0" = self.buildNodePackage {
     name = "normalize-git-url-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz";
@@ -19839,12 +26364,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."normalize-package-data"."^1.0.0" =
     self.by-version."normalize-package-data"."1.0.3";
   by-version."normalize-package-data"."1.0.3" = self.buildNodePackage {
     name = "normalize-package-data-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz";
@@ -19856,21 +26386,26 @@
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."normalize-package-data"."~1.0.1" =
     self.by-version."normalize-package-data"."1.0.3";
   by-spec."normalize-package-data"."~1.0.3" =
     self.by-version."normalize-package-data"."1.0.3";
   by-spec."npm"."*" =
-    self.by-version."npm"."2.6.0";
-  by-version."npm"."2.6.0" = self.buildNodePackage {
-    name = "npm-2.6.0";
+    self.by-version."npm"."2.6.1";
+  by-version."npm"."2.6.1" = self.buildNodePackage {
+    name = "npm-2.6.1";
+    version = "2.6.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm/-/npm-2.6.0.tgz";
-      name = "npm-2.6.0.tgz";
-      sha1 = "94152624b041d3da3bf2764b1a49006f699a7dd8";
+      url = "http://registry.npmjs.org/npm/-/npm-2.6.1.tgz";
+      name = "npm-2.6.1.tgz";
+      sha1 = "22aefa7867d021f63d60fadc1eb48f0adb744242";
     };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
@@ -19895,7 +26430,7 @@
       "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.3.5" = self.by-version."glob"."4.3.5";
+      "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -19939,13 +26474,18 @@
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
       "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "npm" = self.by-version."npm"."2.6.0";
+  "npm" = self.by-version."npm"."2.6.1";
   by-spec."npm"."1.4.28" =
     self.by-version."npm"."1.4.28";
   by-version."npm"."1.4.28" = self.buildNodePackage {
     name = "npm-1.4.28";
+    version = "1.4.28";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm/-/npm-1.4.28.tgz";
@@ -20006,14 +26546,19 @@
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm"."^2.5.1" =
-    self.by-version."npm"."2.6.0";
+    self.by-version."npm"."2.6.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" = self.buildNodePackage {
     name = "npm-cache-filename-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
@@ -20022,7 +26567,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-cache-filename"."~1.0.1" =
     self.by-version."npm-cache-filename"."1.0.1";
@@ -20030,6 +26579,7 @@
     self.by-version."npm-check-updates"."2.0.0-alpha6";
   by-version."npm-check-updates"."2.0.0-alpha6" = self.buildNodePackage {
     name = "npm-check-updates-2.0.0-alpha6";
+    version = "2.0.0-alpha6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.0.0-alpha6.tgz";
@@ -20041,18 +26591,23 @@
       "cint-8.2.1" = self.by-version."cint"."8.2.1";
       "closest-package-1.0.0" = self.by-version."closest-package"."1.0.0";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
-      "npm-2.6.0" = self.by-version."npm"."2.6.0";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+      "npm-2.6.1" = self.by-version."npm"."2.6.1";
       "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "npm-check-updates" = self.by-version."npm-check-updates"."2.0.0-alpha6";
   by-spec."npm-install-checks"."~1.0.2" =
     self.by-version."npm-install-checks"."1.0.5";
   by-version."npm-install-checks"."1.0.5" = self.buildNodePackage {
     name = "npm-install-checks-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz";
@@ -20063,7 +26618,11 @@
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-install-checks"."~1.0.5" =
     self.by-version."npm-install-checks"."1.0.5";
@@ -20071,6 +26630,7 @@
     self.by-version."npm-package-arg"."2.1.3";
   by-version."npm-package-arg"."2.1.3" = self.buildNodePackage {
     name = "npm-package-arg-2.1.3";
+    version = "2.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz";
@@ -20080,12 +26640,17 @@
     deps = {
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-package-arg"."^3.0.0" =
     self.by-version."npm-package-arg"."3.1.0";
   by-version."npm-package-arg"."3.1.0" = self.buildNodePackage {
     name = "npm-package-arg-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.0.tgz";
@@ -20096,7 +26661,11 @@
       "hosted-git-info-1.5.3" = self.by-version."hosted-git-info"."1.5.3";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-package-arg"."~2.1.3" =
     self.by-version."npm-package-arg"."2.1.3";
@@ -20104,6 +26673,7 @@
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = self.buildNodePackage {
     name = "npm-registry-client-0.2.27";
+    version = "0.2.27";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
@@ -20120,14 +26690,19 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "retry-0.6.0" = self.by-version."retry"."0.6.0";
       "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
+    };
+    optionalDependencies = {
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-registry-client"."~2.0.7" =
     self.by-version."npm-registry-client"."2.0.7";
   by-version."npm-registry-client"."2.0.7" = self.buildNodePackage {
     name = "npm-registry-client-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-2.0.7.tgz";
@@ -20144,14 +26719,19 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
+    };
+    optionalDependencies = {
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-registry-client"."~4.0.4" =
     self.by-version."npm-registry-client"."4.0.5";
   by-version."npm-registry-client"."4.0.5" = self.buildNodePackage {
     name = "npm-registry-client-4.0.5";
+    version = "4.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz";
@@ -20170,14 +26750,19 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
+    };
+    optionalDependencies = {
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-registry-client"."~6.1.1" =
     self.by-version."npm-registry-client"."6.1.1";
   by-version."npm-registry-client"."6.1.1" = self.buildNodePackage {
     name = "npm-registry-client-6.1.1";
+    version = "6.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.1.tgz";
@@ -20197,14 +26782,19 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
+    };
+    optionalDependencies = {
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-user-validate"."~0.1.0" =
     self.by-version."npm-user-validate"."0.1.1";
   by-version."npm-user-validate"."0.1.1" = self.buildNodePackage {
     name = "npm-user-validate-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz";
@@ -20213,22 +26803,27 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npm-user-validate"."~0.1.1" =
     self.by-version."npm-user-validate"."0.1.1";
-  by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.10.3" =
-    self.by-version."npm2nix"."5.10.3";
-  by-version."npm2nix"."5.10.3" = self.buildNodePackage {
-    name = "npm2nix-5.10.3";
+  by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.11.0" =
+    self.by-version."npm2nix"."5.11.0";
+  by-version."npm2nix"."5.11.0" = self.buildNodePackage {
+    name = "npm2nix-5.11.0";
+    version = "5.11.0";
     bin = true;
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
-      rev = "d7c63c4edf4d6df4ff829c47f487b5903307b053";
-      sha256 = "8c2ef1a6b1637440d181282f90d46f55dcf92c4eecf8093663a53041225754cd";
+      rev = "95ebee69a177910f47c661870f1b4b549f5ce796";
+      sha256 = "2a1e675b906a7b176af2953427ac38269c2ebe9ff37e96d9c18da98fa6aae3a7";
     };
     deps = {
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "npm-registry-client-0.2.27" = self.by-version."npm-registry-client"."0.2.27";
       "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1";
@@ -20236,15 +26831,20 @@
       "temp-0.6.0" = self.by-version."temp"."0.6.0";
       "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2";
       "findit-1.2.0" = self.by-version."findit"."1.2.0";
-      "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0";
+      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.10.3";
+  "npm2nix" = self.by-version."npm2nix"."5.11.0";
   by-spec."npmconf"."0.1.1" =
     self.by-version."npmconf"."0.1.1";
   by-version."npmconf"."0.1.1" = self.buildNodePackage {
     name = "npmconf-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
@@ -20261,12 +26861,17 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmconf"."0.1.16" =
     self.by-version."npmconf"."0.1.16";
   by-version."npmconf"."0.1.16" = self.buildNodePackage {
     name = "npmconf-0.1.16";
+    version = "0.1.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
@@ -20283,12 +26888,17 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmconf"."2.0.9" =
     self.by-version."npmconf"."2.0.9";
   by-version."npmconf"."2.0.9" = self.buildNodePackage {
     name = "npmconf-2.0.9";
+    version = "2.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
@@ -20306,12 +26916,17 @@
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmconf"."^2.0.1" =
     self.by-version."npmconf"."2.1.1";
   by-version."npmconf"."2.1.1" = self.buildNodePackage {
     name = "npmconf-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz";
@@ -20329,7 +26944,11 @@
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.16";
@@ -20337,6 +26956,7 @@
     self.by-version."npmconf"."1.1.9";
   by-version."npmconf"."1.1.9" = self.buildNodePackage {
     name = "npmconf-1.1.9";
+    version = "1.1.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmconf/-/npmconf-1.1.9.tgz";
@@ -20354,7 +26974,11 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmconf"."~2.1.1" =
     self.by-version."npmconf"."2.1.1";
@@ -20362,6 +26986,7 @@
     self.by-version."npmlog"."1.1.0";
   by-version."npmlog"."1.1.0" = self.buildNodePackage {
     name = "npmlog-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz";
@@ -20373,12 +26998,17 @@
       "are-we-there-yet-1.0.2" = self.by-version."are-we-there-yet"."1.0.2";
       "gauge-1.1.0" = self.by-version."gauge"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmlog"."0" =
     self.by-version."npmlog"."0.1.1";
   by-version."npmlog"."0.1.1" = self.buildNodePackage {
     name = "npmlog-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
@@ -20388,7 +27018,11 @@
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."npmlog"."0.1 || 1" =
     self.by-version."npmlog"."1.1.0";
@@ -20400,6 +27034,7 @@
     self.by-version."nssocket"."0.5.3";
   by-version."nssocket"."0.5.3" = self.buildNodePackage {
     name = "nssocket-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz";
@@ -20410,12 +27045,17 @@
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
       "lazy-1.0.11" = self.by-version."lazy"."1.0.11";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ntwitter".">=0.5.0" =
     self.by-version."ntwitter"."0.5.0";
   by-version."ntwitter"."0.5.0" = self.buildNodePackage {
     name = "ntwitter-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ntwitter/-/ntwitter-0.5.0.tgz";
@@ -20427,12 +27067,17 @@
       "cookies-0.1.6" = self.by-version."cookies"."0.1.6";
       "keygrip-0.2.4" = self.by-version."keygrip"."0.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."numeral"."^1.5.3" =
     self.by-version."numeral"."1.5.3";
   by-version."numeral"."1.5.3" = self.buildNodePackage {
     name = "numeral-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
@@ -20441,12 +27086,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nwmatcher"."~1.3.1" =
     self.by-version."nwmatcher"."1.3.4";
   by-version."nwmatcher"."1.3.4" = self.buildNodePackage {
     name = "nwmatcher-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.4.tgz";
@@ -20455,7 +27105,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nwmatcher"."~1.3.2" =
     self.by-version."nwmatcher"."1.3.4";
@@ -20463,6 +27117,7 @@
     self.by-version."oauth"."0.9.12";
   by-version."oauth"."0.9.12" = self.buildNodePackage {
     name = "oauth-0.9.12";
+    version = "0.9.12";
     bin = false;
     src = fetchurl {
       url = "https://github.com/ciaranj/node-oauth/tarball/master";
@@ -20471,18 +27126,27 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."oauth"."0.9.12" =
+    self.by-version."oauth"."0.9.12";
   by-spec."oauth"."0.9.x" =
     self.by-version."oauth"."0.9.12";
   by-spec."oauth".">=0.8.4" =
     self.by-version."oauth"."0.9.12";
+  by-spec."oauth".">=0.9.9" =
+    self.by-version."oauth"."0.9.12";
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
     self.by-version."oauth"."0.9.12";
   by-spec."oauth-sign"."~0.2.0" =
     self.by-version."oauth-sign"."0.2.0";
   by-version."oauth-sign"."0.2.0" = self.buildNodePackage {
     name = "oauth-sign-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
@@ -20491,12 +27155,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."oauth-sign"."~0.3.0" =
     self.by-version."oauth-sign"."0.3.0";
   by-version."oauth-sign"."0.3.0" = self.buildNodePackage {
     name = "oauth-sign-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
@@ -20505,12 +27174,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."oauth-sign"."~0.4.0" =
     self.by-version."oauth-sign"."0.4.0";
   by-version."oauth-sign"."0.4.0" = self.buildNodePackage {
     name = "oauth-sign-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
@@ -20519,12 +27193,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."oauth-sign"."~0.5.0" =
     self.by-version."oauth-sign"."0.5.0";
   by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
     name = "oauth-sign-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
@@ -20533,12 +27212,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."oauth-sign"."~0.6.0" =
     self.by-version."oauth-sign"."0.6.0";
   by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
     name = "oauth-sign-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
@@ -20547,12 +27231,39 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth2orize"."1.0.1" =
+    self.by-version."oauth2orize"."1.0.1";
+  by-version."oauth2orize"."1.0.1" = self.buildNodePackage {
+    name = "oauth2orize-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth2orize/-/oauth2orize-1.0.1.tgz";
+      name = "oauth2orize-1.0.1.tgz";
+      sha1 = "eceb666b641caf717df43e63511518796c93642d";
+    };
+    deps = {
+      "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-additions"."^0.5.1" =
     self.by-version."object-additions"."0.5.1";
   by-version."object-additions"."0.5.1" = self.buildNodePackage {
     name = "object-additions-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
@@ -20561,12 +27272,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-assign"."^0.3.0" =
     self.by-version."object-assign"."0.3.1";
   by-version."object-assign"."0.3.1" = self.buildNodePackage {
     name = "object-assign-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
@@ -20575,12 +27291,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-assign"."^1.0.0" =
     self.by-version."object-assign"."1.0.0";
   by-version."object-assign"."1.0.0" = self.buildNodePackage {
     name = "object-assign-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
@@ -20589,12 +27310,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-assign"."^2.0.0" =
     self.by-version."object-assign"."2.0.0";
   by-version."object-assign"."2.0.0" = self.buildNodePackage {
     name = "object-assign-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz";
@@ -20603,12 +27329,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-component"."0.0.3" =
     self.by-version."object-component"."0.0.3";
   by-version."object-component"."0.0.3" = self.buildNodePackage {
     name = "object-component-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
@@ -20617,12 +27348,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = self.buildNodePackage {
     name = "object-keys-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
@@ -20631,12 +27367,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."on-finished"."2.1.0" =
     self.by-version."on-finished"."2.1.0";
   by-version."on-finished"."2.1.0" = self.buildNodePackage {
     name = "on-finished-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
@@ -20646,12 +27387,17 @@
     deps = {
       "ee-first-1.0.5" = self.by-version."ee-first"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."on-finished"."~2.1.0" =
     self.by-version."on-finished"."2.1.1";
   by-version."on-finished"."2.1.1" = self.buildNodePackage {
     name = "on-finished-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
@@ -20661,7 +27407,11 @@
     deps = {
       "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."on-finished"."~2.1.1" =
     self.by-version."on-finished"."2.1.1";
@@ -20669,6 +27419,7 @@
     self.by-version."on-finished"."2.2.0";
   by-version."on-finished"."2.2.0" = self.buildNodePackage {
     name = "on-finished-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz";
@@ -20678,12 +27429,17 @@
     deps = {
       "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."on-headers"."~1.0.0" =
+  by-spec."on-headers"."1.0.0" =
     self.by-version."on-headers"."1.0.0";
   by-version."on-headers"."1.0.0" = self.buildNodePackage {
     name = "on-headers-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
@@ -20692,12 +27448,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."on-headers"."~1.0.0" =
+    self.by-version."on-headers"."1.0.0";
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = self.buildNodePackage {
     name = "once-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
@@ -20706,12 +27469,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."1.3.0" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = self.buildNodePackage {
     name = "once-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz";
@@ -20720,12 +27488,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."1.x" =
     self.by-version."once"."1.3.1";
   by-version."once"."1.3.1" = self.buildNodePackage {
     name = "once-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
@@ -20735,7 +27508,11 @@
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."^1.1.1" =
     self.by-version."once"."1.3.1";
@@ -20749,6 +27526,7 @@
     self.by-version."once"."1.2.0";
   by-version."once"."1.2.0" = self.buildNodePackage {
     name = "once-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz";
@@ -20757,7 +27535,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."~1.3.0" =
     self.by-version."once"."1.3.1";
@@ -20767,6 +27549,7 @@
     self.by-version."onetime"."1.0.0";
   by-version."onetime"."1.0.0" = self.buildNodePackage {
     name = "onetime-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz";
@@ -20775,12 +27558,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = self.buildNodePackage {
     name = "open-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
@@ -20789,12 +27577,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."open"."0.0.5" =
     self.by-version."open"."0.0.5";
   by-version."open"."0.0.5" = self.buildNodePackage {
     name = "open-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
@@ -20803,7 +27596,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."open"."0.0.x" =
     self.by-version."open"."0.0.5";
@@ -20811,10 +27608,11 @@
     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" =
+  by-spec."opener"."1.4.0" =
     self.by-version."opener"."1.4.0";
   by-version."opener"."1.4.0" = self.buildNodePackage {
     name = "opener-1.4.0";
+    version = "1.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz";
@@ -20823,12 +27621,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
   by-version."opener"."1.3.0" = self.buildNodePackage {
     name = "opener-1.3.0";
+    version = "1.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
@@ -20837,7 +27640,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."opener"."~1.4.0" =
     self.by-version."opener"."1.4.0";
@@ -20845,6 +27652,7 @@
     self.by-version."openid"."0.5.9";
   by-version."openid"."0.5.9" = self.buildNodePackage {
     name = "openid-0.5.9";
+    version = "0.5.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
@@ -20853,12 +27661,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."opn"."~1.0.0" =
     self.by-version."opn"."1.0.1";
   by-version."opn"."1.0.1" = self.buildNodePackage {
     name = "opn-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/opn/-/opn-1.0.1.tgz";
@@ -20867,12 +27680,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.1";
   by-version."optimist"."0.6.1" = self.buildNodePackage {
     name = "optimist-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
@@ -20883,13 +27701,18 @@
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "optimist" = self.by-version."optimist"."0.6.1";
   by-spec."optimist"."0.2" =
     self.by-version."optimist"."0.2.8";
   by-version."optimist"."0.2.8" = self.buildNodePackage {
     name = "optimist-0.2.8";
+    version = "0.2.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
@@ -20899,12 +27722,17 @@
     deps = {
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."0.6.0" =
     self.by-version."optimist"."0.6.0";
   by-version."optimist"."0.6.0" = self.buildNodePackage {
     name = "optimist-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
@@ -20915,7 +27743,11 @@
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."0.6.x" =
     self.by-version."optimist"."0.6.1";
@@ -20925,6 +27757,7 @@
     self.by-version."optimist"."0.3.7";
   by-version."optimist"."0.3.7" = self.buildNodePackage {
     name = "optimist-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
@@ -20934,7 +27767,11 @@
     deps = {
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."~0.3.4" =
     self.by-version."optimist"."0.3.7";
@@ -20948,6 +27785,7 @@
     self.by-version."optionator"."0.5.0";
   by-version."optionator"."0.5.0" = self.buildNodePackage {
     name = "optionator-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
@@ -20962,12 +27800,17 @@
       "levn-0.2.5" = self.by-version."levn"."0.2.5";
       "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.6";
   by-version."options"."0.0.6" = self.buildNodePackage {
     name = "options-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
@@ -20976,12 +27819,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optjs"."*" =
     self.by-version."optjs"."3.2.1-boom";
   by-version."optjs"."3.2.1-boom" = self.buildNodePackage {
     name = "optjs-3.2.1-boom";
+    version = "3.2.1-boom";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
@@ -20990,12 +27838,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
   by-version."optparse"."1.0.5" = self.buildNodePackage {
     name = "optparse-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
@@ -21004,7 +27857,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
@@ -21013,6 +27870,7 @@
     self.by-version."opts"."1.2.2";
   by-version."opts"."1.2.2" = self.buildNodePackage {
     name = "opts-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
@@ -21021,12 +27879,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."orchestrator"."^0.3.0" =
     self.by-version."orchestrator"."0.3.7";
   by-version."orchestrator"."0.3.7" = self.buildNodePackage {
     name = "orchestrator-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
@@ -21038,12 +27901,17 @@
       "sequencify-0.0.7" = self.by-version."sequencify"."0.0.7";
       "stream-consume-0.1.0" = self.by-version."stream-consume"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ordered-read-streams"."^0.1.0" =
     self.by-version."ordered-read-streams"."0.1.0";
   by-version."ordered-read-streams"."0.1.0" = self.buildNodePackage {
     name = "ordered-read-streams-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
@@ -21052,12 +27920,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
   by-version."os-browserify"."0.1.2" = self.buildNodePackage {
     name = "os-browserify-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
@@ -21066,12 +27939,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."os-browserify"."~0.1.2" =
+    self.by-version."os-browserify"."0.1.2";
   by-spec."os-name"."^1.0.0" =
     self.by-version."os-name"."1.0.3";
   by-version."os-name"."1.0.3" = self.buildNodePackage {
     name = "os-name-1.0.3";
+    version = "1.0.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz";
@@ -21082,12 +27962,17 @@
       "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0";
       "win-release-1.0.0" = self.by-version."win-release"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."osenv"."0" =
     self.by-version."osenv"."0.1.0";
   by-version."osenv"."0.1.0" = self.buildNodePackage {
     name = "osenv-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
@@ -21096,12 +27981,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
   by-version."osenv"."0.0.3" = self.buildNodePackage {
     name = "osenv-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
@@ -21110,7 +28000,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."osenv"."0.1.0" =
     self.by-version."osenv"."0.1.0";
@@ -21122,6 +28016,7 @@
     self.by-version."osx-release"."1.0.0";
   by-version."osx-release"."1.0.0" = self.buildNodePackage {
     name = "osx-release-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz";
@@ -21131,12 +28026,17 @@
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."osx-trash"."^1.0.0" =
     self.by-version."osx-trash"."1.0.0";
   by-version."osx-trash"."1.0.0" = self.buildNodePackage {
     name = "osx-trash-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/osx-trash/-/osx-trash-1.0.0.tgz";
@@ -21147,12 +28047,17 @@
       "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0";
       "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage {
     name = "owl-deepcopy-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
@@ -21161,7 +28066,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
   by-spec."owl-deepcopy"."~0.0.1" =
@@ -21170,6 +28079,7 @@
     self.by-version."p-throttler"."0.1.0";
   by-version."p-throttler"."0.1.0" = self.buildNodePackage {
     name = "p-throttler-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz";
@@ -21179,12 +28089,17 @@
     deps = {
       "q-0.9.7" = self.by-version."q"."0.9.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pac-proxy-agent"."0" =
     self.by-version."pac-proxy-agent"."0.2.0";
   by-version."pac-proxy-agent"."0.2.0" = self.buildNodePackage {
     name = "pac-proxy-agent-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-0.2.0.tgz";
@@ -21194,37 +28109,47 @@
     deps = {
       "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "pac-resolver-1.2.4" = self.by-version."pac-resolver"."1.2.4";
+      "pac-resolver-1.2.6" = self.by-version."pac-resolver"."1.2.6";
       "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
       "get-uri-0.1.3" = self.by-version."get-uri"."0.1.3";
       "stream-to-array-1.0.0" = self.by-version."stream-to-array"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pac-resolver"."~1.2.1" =
-    self.by-version."pac-resolver"."1.2.4";
-  by-version."pac-resolver"."1.2.4" = self.buildNodePackage {
-    name = "pac-resolver-1.2.4";
+    self.by-version."pac-resolver"."1.2.6";
+  by-version."pac-resolver"."1.2.6" = self.buildNodePackage {
+    name = "pac-resolver-1.2.6";
+    version = "1.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.4.tgz";
-      name = "pac-resolver-1.2.4.tgz";
-      sha1 = "c6948acc57a1e78c8104ccdc8a4c89de90189008";
+      url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.6.tgz";
+      name = "pac-resolver-1.2.6.tgz";
+      sha1 = "ed03af0c5b5933505bdd3f07f75175466d5e7cfb";
     };
     deps = {
       "co-3.0.6" = self.by-version."co"."3.0.6";
       "netmask-1.0.5" = self.by-version."netmask"."1.0.5";
       "degenerator-1.0.0" = self.by-version."degenerator"."1.0.0";
-      "regenerator-0.4.12" = self.by-version."regenerator"."0.4.12";
+      "regenerator-0.8.14" = self.by-version."regenerator"."0.8.14";
       "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."package-json"."^0.2.0" =
     self.by-version."package-json"."0.2.0";
   by-version."package-json"."0.2.0" = self.buildNodePackage {
     name = "package-json-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz";
@@ -21235,28 +28160,38 @@
       "got-0.3.0" = self.by-version."got"."0.3.0";
       "registry-url-0.1.1" = self.by-version."registry-url"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."package-json"."^1.0.0" =
-    self.by-version."package-json"."1.0.2";
-  by-version."package-json"."1.0.2" = self.buildNodePackage {
-    name = "package-json-1.0.2";
+    self.by-version."package-json"."1.1.0";
+  by-version."package-json"."1.1.0" = self.buildNodePackage {
+    name = "package-json-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/package-json/-/package-json-1.0.2.tgz";
-      name = "package-json-1.0.2.tgz";
-      sha1 = "b3a5ef5a3072c95bc7b62cb643829428972f669b";
+      url = "http://registry.npmjs.org/package-json/-/package-json-1.1.0.tgz";
+      name = "package-json-1.1.0.tgz";
+      sha1 = "32b427c626385ccce180dc73a66d94f35f545e4b";
     };
     deps = {
       "got-2.4.0" = self.by-version."got"."2.4.0";
-      "registry-url-2.1.0" = self.by-version."registry-url"."2.1.0";
+      "registry-url-3.0.0" = self.by-version."registry-url"."3.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pad"."0.0.5" =
     self.by-version."pad"."0.0.5";
   by-version."pad"."0.0.5" = self.buildNodePackage {
     name = "pad-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pad/-/pad-0.0.5.tgz";
@@ -21265,12 +28200,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pako"."~0.2.0" =
     self.by-version."pako"."0.2.5";
   by-version."pako"."0.2.5" = self.buildNodePackage {
     name = "pako-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
@@ -21279,12 +28219,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parents"."0.0.2" =
     self.by-version."parents"."0.0.2";
   by-version."parents"."0.0.2" = self.buildNodePackage {
     name = "parents-0.0.2";
+    version = "0.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
@@ -21293,12 +28238,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parents"."^1.0.0" =
     self.by-version."parents"."1.0.1";
   by-version."parents"."1.0.1" = self.buildNodePackage {
     name = "parents-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
@@ -21308,7 +28258,11 @@
     deps = {
       "path-platform-0.11.15" = self.by-version."path-platform"."0.11.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parents"."^1.0.1" =
     self.by-version."parents"."1.0.1";
@@ -21316,6 +28270,7 @@
     self.by-version."parents"."0.0.3";
   by-version."parents"."0.0.3" = self.buildNodePackage {
     name = "parents-0.0.3";
+    version = "0.0.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
@@ -21325,12 +28280,17 @@
     deps = {
       "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parse-asn1"."^2.0.0" =
     self.by-version."parse-asn1"."2.0.0";
   by-version."parse-asn1"."2.0.0" = self.buildNodePackage {
     name = "parse-asn1-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz";
@@ -21342,12 +28302,17 @@
       "asn1.js-rfc3280-1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0";
       "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parse-torrent"."^1.4.0" =
     self.by-version."parse-torrent"."1.7.0";
   by-version."parse-torrent"."1.7.0" = self.buildNodePackage {
     name = "parse-torrent-1.7.0";
+    version = "1.7.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz";
@@ -21357,12 +28322,17 @@
     deps = {
       "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parse-torrent"."~1.0.0" =
     self.by-version."parse-torrent"."1.0.0";
   by-version."parse-torrent"."1.0.0" = self.buildNodePackage {
     name = "parse-torrent-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz";
@@ -21373,12 +28343,17 @@
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "rusha-browserify-0.7.3" = self.by-version."rusha-browserify"."0.7.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parsejson"."0.0.1" =
     self.by-version."parsejson"."0.0.1";
   by-version."parsejson"."0.0.1" = self.buildNodePackage {
     name = "parsejson-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
@@ -21388,12 +28363,17 @@
     deps = {
       "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parseqs"."0.0.2" =
     self.by-version."parseqs"."0.0.2";
   by-version."parseqs"."0.0.2" = self.buildNodePackage {
     name = "parseqs-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
@@ -21403,12 +28383,17 @@
     deps = {
       "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parseuri"."0.0.2" =
     self.by-version."parseuri"."0.0.2";
   by-version."parseuri"."0.0.2" = self.buildNodePackage {
     name = "parseuri-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz";
@@ -21418,12 +28403,17 @@
     deps = {
       "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parseurl"."1.0.1" =
     self.by-version."parseurl"."1.0.1";
   by-version."parseurl"."1.0.1" = self.buildNodePackage {
     name = "parseurl-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
@@ -21432,12 +28422,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parseurl"."~1.1.3" =
     self.by-version."parseurl"."1.1.3";
   by-version."parseurl"."1.1.3" = self.buildNodePackage {
     name = "parseurl-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
@@ -21446,12 +28441,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parseurl"."~1.3.0" =
     self.by-version."parseurl"."1.3.0";
   by-version."parseurl"."1.3.0" = self.buildNodePackage {
     name = "parseurl-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
@@ -21460,12 +28460,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."parsoid"."*" =
     self.by-version."parsoid"."0.2.0";
   by-version."parsoid"."0.2.0" = self.buildNodePackage {
     name = "parsoid-0.2.0";
+    version = "0.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/parsoid/-/parsoid-0.2.0.tgz";
@@ -21492,13 +28497,18 @@
       "simplediff-0.1.1" = self.by-version."simplediff"."0.1.1";
       "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "parsoid" = self.by-version."parsoid"."0.2.0";
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.1";
   by-version."passport"."0.2.1" = self.buildNodePackage {
     name = "passport-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz";
@@ -21509,15 +28519,22 @@
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "passport" = self.by-version."passport"."0.2.1";
+  by-spec."passport"."0.2.1" =
+    self.by-version."passport"."0.2.1";
   by-spec."passport".">=0.1.15" =
     self.by-version."passport"."0.2.1";
   by-spec."passport"."~0.1.1" =
     self.by-version."passport"."0.1.18";
   by-version."passport"."0.1.18" = self.buildNodePackage {
     name = "passport-0.1.18";
+    version = "0.1.18";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
@@ -21528,7 +28545,11 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport"."~0.1.3" =
     self.by-version."passport"."0.1.18";
@@ -21538,6 +28559,7 @@
     self.by-version."passport-bitly"."0.1.0";
   by-version."passport-bitly"."0.1.0" = self.buildNodePackage {
     name = "passport-bitly-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchgit {
       url = "git://github.com/simov/passport-bitly.git";
@@ -21548,12 +28570,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-dropbox".">=0.1.2" =
     self.by-version."passport-dropbox"."0.1.2";
   by-version."passport-dropbox"."0.1.2" = self.buildNodePackage {
     name = "passport-dropbox-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-dropbox/-/passport-dropbox-0.1.2.tgz";
@@ -21564,12 +28591,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-evernote"."^0.1.1" =
     self.by-version."passport-evernote"."0.1.1";
   by-version."passport-evernote"."0.1.1" = self.buildNodePackage {
     name = "passport-evernote-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-evernote/-/passport-evernote-0.1.1.tgz";
@@ -21580,12 +28612,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-facebook".">=0.1.5" =
     self.by-version."passport-facebook"."1.0.3";
   by-version."passport-facebook"."1.0.3" = self.buildNodePackage {
     name = "passport-facebook-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-1.0.3.tgz";
@@ -21595,12 +28632,17 @@
     deps = {
       "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-flickr".">=0.1.1" =
     self.by-version."passport-flickr"."0.2.0";
   by-version."passport-flickr"."0.2.0" = self.buildNodePackage {
     name = "passport-flickr-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-flickr/-/passport-flickr-0.2.0.tgz";
@@ -21610,12 +28652,17 @@
     deps = {
       "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-github".">=0.1.5" =
     self.by-version."passport-github"."0.1.5";
   by-version."passport-github"."0.1.5" = self.buildNodePackage {
     name = "passport-github-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-github/-/passport-github-0.1.5.tgz";
@@ -21626,12 +28673,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-google-oauth"."*" =
     self.by-version."passport-google-oauth"."0.1.5";
   by-version."passport-google-oauth"."0.1.5" = self.buildNodePackage {
     name = "passport-google-oauth-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.1.5.tgz";
@@ -21642,7 +28694,11 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-google-oauth".">=0.1.5" =
     self.by-version."passport-google-oauth"."0.1.5";
@@ -21650,6 +28706,7 @@
     self.by-version."passport-http"."0.2.2";
   by-version."passport-http"."0.2.2" = self.buildNodePackage {
     name = "passport-http-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
@@ -21660,13 +28717,38 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-0.1.18" = self.by-version."passport"."0.1.18";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "passport-http" = self.by-version."passport-http"."0.2.2";
+  by-spec."passport-http-bearer"."1.0.1" =
+    self.by-version."passport-http-bearer"."1.0.1";
+  by-version."passport-http-bearer"."1.0.1" = self.buildNodePackage {
+    name = "passport-http-bearer-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz";
+      name = "passport-http-bearer-1.0.1.tgz";
+      sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8";
+    };
+    deps = {
+      "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."passport-imgur".">=0.0.1" =
     self.by-version."passport-imgur"."0.0.2";
   by-version."passport-imgur"."0.0.2" = self.buildNodePackage {
     name = "passport-imgur-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-imgur/-/passport-imgur-0.0.2.tgz";
@@ -21676,12 +28758,17 @@
     deps = {
       "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-instagram".">=0.1.2" =
     self.by-version."passport-instagram"."0.1.2";
   by-version."passport-instagram"."0.1.2" = self.buildNodePackage {
     name = "passport-instagram-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-instagram/-/passport-instagram-0.1.2.tgz";
@@ -21692,12 +28779,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-local"."*" =
     self.by-version."passport-local"."1.0.0";
   by-version."passport-local"."1.0.0" = self.buildNodePackage {
     name = "passport-local-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
@@ -21707,7 +28799,11 @@
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "passport-local" = self.by-version."passport-local"."1.0.0";
   by-spec."passport-local"."~1.0.0" =
@@ -21716,6 +28812,7 @@
     self.by-version."passport-mailchimp"."0.0.1";
   by-version."passport-mailchimp"."0.0.1" = self.buildNodePackage {
     name = "passport-mailchimp-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-mailchimp/-/passport-mailchimp-0.0.1.tgz";
@@ -21726,12 +28823,17 @@
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-mixcloud".">=0.0.1" =
     self.by-version."passport-mixcloud"."0.0.2";
   by-version."passport-mixcloud"."0.0.2" = self.buildNodePackage {
     name = "passport-mixcloud-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-mixcloud/-/passport-mixcloud-0.0.2.tgz";
@@ -21744,12 +28846,17 @@
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-oauth"."0.1.x" =
     self.by-version."passport-oauth"."0.1.15";
   by-version."passport-oauth"."0.1.15" = self.buildNodePackage {
     name = "passport-oauth-0.1.15";
+    version = "0.1.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-0.1.15.tgz";
@@ -21761,12 +28868,17 @@
       "passport-0.1.18" = self.by-version."passport"."0.1.18";
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-oauth".">= 0.1.0" =
     self.by-version."passport-oauth"."1.0.0";
   by-version."passport-oauth"."1.0.0" = self.buildNodePackage {
     name = "passport-oauth-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz";
@@ -21777,7 +28889,11 @@
       "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
       "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-oauth"."~0.1.1" =
     self.by-version."passport-oauth"."0.1.15";
@@ -21789,6 +28905,7 @@
     self.by-version."passport-oauth1"."1.0.1";
   by-version."passport-oauth1"."1.0.1" = self.buildNodePackage {
     name = "passport-oauth1-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.0.1.tgz";
@@ -21800,12 +28917,17 @@
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-oauth2"."1.x.x" =
     self.by-version."passport-oauth2"."1.1.2";
   by-version."passport-oauth2"."1.1.2" = self.buildNodePackage {
     name = "passport-oauth2-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.1.2.tgz";
@@ -21817,12 +28939,37 @@
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."passport-oauth2-client-password"."0.1.2" =
+    self.by-version."passport-oauth2-client-password"."0.1.2";
+  by-version."passport-oauth2-client-password"."0.1.2" = self.buildNodePackage {
+    name = "passport-oauth2-client-password-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz";
+      name = "passport-oauth2-client-password-0.1.2.tgz";
+      sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
+    };
+    deps = {
+      "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-soundcloud".">=0.1.2" =
     self.by-version."passport-soundcloud"."0.1.2";
   by-version."passport-soundcloud"."0.1.2" = self.buildNodePackage {
     name = "passport-soundcloud-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz";
@@ -21833,12 +28980,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-strategy"."1.x.x" =
     self.by-version."passport-strategy"."1.0.0";
   by-version."passport-strategy"."1.0.0" = self.buildNodePackage {
     name = "passport-strategy-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
@@ -21847,12 +28999,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-trello"."~0.1.4" =
     self.by-version."passport-trello"."0.1.4";
   by-version."passport-trello"."0.1.4" = self.buildNodePackage {
     name = "passport-trello-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-trello/-/passport-trello-0.1.4.tgz";
@@ -21862,12 +29019,17 @@
     deps = {
       "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-twitter".">=0.1.4" =
     self.by-version."passport-twitter"."1.0.2";
   by-version."passport-twitter"."1.0.2" = self.buildNodePackage {
     name = "passport-twitter-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.2.tgz";
@@ -21878,12 +29040,17 @@
       "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
       "xtraverse-0.1.0" = self.by-version."xtraverse"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."passport-wordpress".">=0.0.1" =
     self.by-version."passport-wordpress"."0.0.3";
   by-version."passport-wordpress"."0.0.3" = self.buildNodePackage {
     name = "passport-wordpress-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz";
@@ -21894,12 +29061,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."path-browserify"."~0.0.0" =
+  by-spec."path-browserify"."0.0.0" =
     self.by-version."path-browserify"."0.0.0";
   by-version."path-browserify"."0.0.0" = self.buildNodePackage {
     name = "path-browserify-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
@@ -21908,12 +29080,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."path-browserify"."~0.0.0" =
+    self.by-version."path-browserify"."0.0.0";
   by-spec."path-is-inside"."^1.0.1" =
     self.by-version."path-is-inside"."1.0.1";
   by-version."path-is-inside"."1.0.1" = self.buildNodePackage {
     name = "path-is-inside-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
@@ -21922,7 +29101,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."path-is-inside"."~1.0.0" =
     self.by-version."path-is-inside"."1.0.1";
@@ -21930,6 +29113,7 @@
     self.by-version."path-platform"."0.0.1";
   by-version."path-platform"."0.0.1" = self.buildNodePackage {
     name = "path-platform-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
@@ -21938,12 +29122,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."path-platform"."~0.11.15" =
     self.by-version."path-platform"."0.11.15";
   by-version."path-platform"."0.11.15" = self.buildNodePackage {
     name = "path-platform-0.11.15";
+    version = "0.11.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
@@ -21952,12 +29141,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."path-proxy"."~1.0" =
     self.by-version."path-proxy"."1.0.0";
   by-version."path-proxy"."1.0.0" = self.buildNodePackage {
     name = "path-proxy-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz";
@@ -21967,12 +29161,17 @@
     deps = {
       "inflection-1.3.8" = self.by-version."inflection"."1.3.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."path-to-regexp"."0.1.3" =
     self.by-version."path-to-regexp"."0.1.3";
   by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
     name = "path-to-regexp-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
@@ -21981,12 +29180,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
   by-version."pause"."0.0.1" = self.buildNodePackage {
     name = "pause-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
@@ -21995,12 +29199,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pbkdf2-compat"."2.0.1" =
+    self.by-version."pbkdf2-compat"."2.0.1";
+  by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage {
+    name = "pbkdf2-compat-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
+      name = "pbkdf2-compat-2.0.1.tgz";
+      sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pbkdf2-compat"."^3.0.1" =
     self.by-version."pbkdf2-compat"."3.0.2";
   by-version."pbkdf2-compat"."3.0.2" = self.buildNodePackage {
     name = "pbkdf2-compat-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz";
@@ -22010,12 +29238,17 @@
     deps = {
       "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."peer-wire-protocol"."^0.7.0" =
     self.by-version."peer-wire-protocol"."0.7.0";
   by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage {
     name = "peer-wire-protocol-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz";
@@ -22028,12 +29261,17 @@
       "bncode-0.2.3" = self.by-version."bncode"."0.2.3";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."peer-wire-swarm"."^0.9.0" =
     self.by-version."peer-wire-swarm"."0.9.2";
   by-version."peer-wire-swarm"."0.9.2" = self.buildNodePackage {
     name = "peer-wire-swarm-0.9.2";
+    version = "0.9.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
@@ -22046,7 +29284,11 @@
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."peer-wire-swarm"."^0.9.2" =
     self.by-version."peer-wire-swarm"."0.9.2";
@@ -22054,6 +29296,7 @@
     self.by-version."peerflix"."0.25.2";
   by-version."peerflix"."0.25.2" = self.buildNodePackage {
     name = "peerflix-0.25.2";
+    version = "0.25.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.2.tgz";
@@ -22061,7 +29304,6 @@
       sha1 = "244997a977c881995a3acce7bd7511c3f4006467";
     };
     deps = {
-      "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11";
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
@@ -22077,39 +29319,21 @@
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+      "airplay-js-0.2.12" = self.by-version."airplay-js"."0.2.12";
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "peerflix" = self.by-version."peerflix"."0.25.2";
-  by-spec."peerflix"."^0.19.1" =
-    self.by-version."peerflix"."0.19.3";
-  by-version."peerflix"."0.19.3" = self.buildNodePackage {
-    name = "peerflix-0.19.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.19.3.tgz";
-      name = "peerflix-0.19.3.tgz";
-      sha1 = "2376097d7563f37db1d6e93c8b1f9cf800592a54";
-    };
-    deps = {
-      "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11";
-      "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "network-address-0.0.4" = self.by-version."network-address"."0.0.4";
-      "numeral-1.5.3" = self.by-version."numeral"."1.5.3";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "rc-0.4.0" = self.by-version."rc"."0.4.0";
-      "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0";
-      "torrent-stream-0.15.1" = self.by-version."torrent-stream"."0.15.1";
-      "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
-    };
-    peerDependencies = [];
-  };
+  by-spec."peerflix"."^0.25.2" =
+    self.by-version."peerflix"."0.25.2";
   by-spec."peerflix-server"."*" =
     self.by-version."peerflix-server"."0.0.20";
   by-version."peerflix-server"."0.0.20" = self.buildNodePackage {
     name = "peerflix-server-0.0.20";
+    version = "0.0.20";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.20.tgz";
@@ -22128,13 +29352,18 @@
       "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
       "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "peerflix-server" = self.by-version."peerflix-server"."0.0.20";
   by-spec."pegjs"."0.6.2" =
     self.by-version."pegjs"."0.6.2";
   by-version."pegjs"."0.6.2" = self.buildNodePackage {
     name = "pegjs-0.6.2";
+    version = "0.6.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
@@ -22143,12 +29372,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pegjs"."git+https://github.com/arlolra/pegjs#startOffset" =
     self.by-version."pegjs"."0.8.0";
   by-version."pegjs"."0.8.0" = self.buildNodePackage {
     name = "pegjs-0.8.0";
+    version = "0.8.0";
     bin = true;
     src = fetchgit {
       url = "https://github.com/arlolra/pegjs";
@@ -22157,12 +29391,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pemstrip"."0.0.1" =
     self.by-version."pemstrip"."0.0.1";
   by-version."pemstrip"."0.0.1" = self.buildNodePackage {
     name = "pemstrip-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz";
@@ -22171,12 +29410,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."phantomjs"."*" =
     self.by-version."phantomjs"."1.9.15";
   by-version."phantomjs"."1.9.15" = self.buildNodePackage {
     name = "phantomjs-1.9.15";
+    version = "1.9.15";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.15.tgz";
@@ -22193,7 +29437,11 @@
       "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "phantomjs" = self.by-version."phantomjs"."1.9.15";
   by-spec."phantomjs"."~1.9.1" =
@@ -22204,6 +29452,7 @@
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = self.buildNodePackage {
     name = "pkginfo-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
@@ -22212,12 +29461,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pkginfo"."0.3.x" =
     self.by-version."pkginfo"."0.3.0";
   by-version."pkginfo"."0.3.0" = self.buildNodePackage {
     name = "pkginfo-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
@@ -22226,7 +29480,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
@@ -22236,6 +29494,7 @@
     self.by-version."playerui"."1.2.0";
   by-version."playerui"."1.2.0" = self.buildNodePackage {
     name = "playerui-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz";
@@ -22248,28 +29507,17 @@
       "single-line-log-0.4.1" = self.by-version."single-line-log"."0.4.1";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."plc"."*" =
-    self.by-version."plc"."0.2.0";
-  by-version."plc"."0.2.0" = self.buildNodePackage {
-    name = "plc-0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/plc/-/plc-0.2.0.tgz";
-      name = "plc-0.2.0.tgz";
-      sha1 = "2218f9217c82ea0d3266bb601a8180abb230675a";
-    };
-    deps = {
-      "bits-0.1.1" = self.by-version."bits"."0.1.1";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "plc" = self.by-version."plc"."0.2.0";
   by-spec."plist"."1.1.0" =
     self.by-version."plist"."1.1.0";
   by-version."plist"."1.1.0" = self.buildNodePackage {
     name = "plist-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz";
@@ -22282,12 +29530,19 @@
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
       "util-deprecate-1.0.0" = self.by-version."util-deprecate"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."plist"."^1.0.1" =
+    self.by-version."plist"."1.1.0";
   by-spec."plist-native"."*" =
     self.by-version."plist-native"."0.3.1";
   by-version."plist-native"."0.3.1" = self.buildNodePackage {
     name = "plist-native-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
@@ -22297,13 +29552,18 @@
     deps = {
       "libxmljs-0.10.0" = self.by-version."libxmljs"."0.10.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "plist-native" = self.by-version."plist-native"."0.3.1";
   by-spec."plist-with-patches"."0.5.1" =
     self.by-version."plist-with-patches"."0.5.1";
   by-version."plist-with-patches"."0.5.1" = self.buildNodePackage {
     name = "plist-with-patches-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz";
@@ -22314,12 +29574,17 @@
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = self.buildNodePackage {
     name = "policyfile-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
@@ -22328,12 +29593,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pooling"."0.4.6" =
     self.by-version."pooling"."0.4.6";
   by-version."pooling"."0.4.6" = self.buildNodePackage {
     name = "pooling-0.4.6";
+    version = "0.4.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz";
@@ -22345,14 +29615,19 @@
       "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1";
       "once-1.3.0" = self.by-version."once"."1.3.0";
       "vasync-1.4.0" = self.by-version."vasync"."1.4.0";
+    };
+    optionalDependencies = {
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pop-iterate"."^1.0.1" =
     self.by-version."pop-iterate"."1.0.1";
   by-version."pop-iterate"."1.0.1" = self.buildNodePackage {
     name = "pop-iterate-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz";
@@ -22361,12 +29636,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."portfinder"."^0.2.1" =
     self.by-version."portfinder"."0.2.1";
   by-version."portfinder"."0.2.1" = self.buildNodePackage {
     name = "portfinder-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz";
@@ -22376,12 +29656,17 @@
     deps = {
       "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."portfinder"."^0.3.0" =
     self.by-version."portfinder"."0.3.0";
   by-version."portfinder"."0.3.0" = self.buildNodePackage {
     name = "portfinder-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
@@ -22391,12 +29676,17 @@
     deps = {
       "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."posix"."*" =
     self.by-version."posix"."2.0.0";
   by-version."posix"."2.0.0" = self.buildNodePackage {
     name = "posix-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz";
@@ -22406,13 +29696,18 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "posix" = self.by-version."posix"."2.0.0";
   by-spec."posix-getopt"."1.0.0" =
     self.by-version."posix-getopt"."1.0.0";
   by-version."posix-getopt"."1.0.0" = self.buildNodePackage {
     name = "posix-getopt-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
@@ -22421,12 +29716,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."posix-getopt"."1.1.0" =
     self.by-version."posix-getopt"."1.1.0";
   by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
     name = "posix-getopt-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
@@ -22435,12 +29735,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."prelude-ls"."~1.1.0" =
     self.by-version."prelude-ls"."1.1.1";
   by-version."prelude-ls"."1.1.1" = self.buildNodePackage {
     name = "prelude-ls-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz";
@@ -22449,7 +29754,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."prelude-ls"."~1.1.1" =
     self.by-version."prelude-ls"."1.1.1";
@@ -22457,6 +29766,7 @@
     self.by-version."prepend-http"."1.0.1";
   by-version."prepend-http"."1.0.1" = self.buildNodePackage {
     name = "prepend-http-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz";
@@ -22465,12 +29775,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pretty-bytes"."^1.0.0" =
     self.by-version."pretty-bytes"."1.0.3";
   by-version."pretty-bytes"."1.0.3" = self.buildNodePackage {
     name = "pretty-bytes-1.0.3";
+    version = "1.0.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.3.tgz";
@@ -22480,12 +29795,17 @@
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pretty-hrtime"."^0.2.0" =
     self.by-version."pretty-hrtime"."0.2.2";
   by-version."pretty-hrtime"."0.2.2" = self.buildNodePackage {
     name = "pretty-hrtime-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz";
@@ -22494,12 +29814,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."prfun"."~1.0.2" =
     self.by-version."prfun"."1.0.2";
   by-version."prfun"."1.0.2" = self.buildNodePackage {
     name = "prfun-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/prfun/-/prfun-1.0.2.tgz";
@@ -22507,14 +29832,19 @@
       sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e";
     };
     deps = {
-      "es6-shim-0.25.0" = self.by-version."es6-shim"."0.25.0";
+      "es6-shim-0.25.3" = self.by-version."es6-shim"."0.25.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."private"."~0.1.2" =
     self.by-version."private"."0.1.6";
   by-version."private"."0.1.6" = self.buildNodePackage {
     name = "private-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/private/-/private-0.1.6.tgz";
@@ -22523,7 +29853,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."private"."~0.1.5" =
     self.by-version."private"."0.1.6";
@@ -22533,6 +29867,7 @@
     self.by-version."process"."0.10.0";
   by-version."process"."0.10.0" = self.buildNodePackage {
     name = "process-0.10.0";
+    version = "0.10.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/process/-/process-0.10.0.tgz";
@@ -22541,12 +29876,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."process"."^0.8.0" =
     self.by-version."process"."0.8.0";
   by-version."process"."0.8.0" = self.buildNodePackage {
     name = "process-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz";
@@ -22555,7 +29895,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."process"."~0.10.0" =
     self.by-version."process"."0.10.0";
@@ -22563,6 +29907,7 @@
     self.by-version."process"."0.5.2";
   by-version."process"."0.5.2" = self.buildNodePackage {
     name = "process-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
@@ -22571,12 +29916,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."process"."~0.6.0" =
     self.by-version."process"."0.6.0";
   by-version."process"."0.6.0" = self.buildNodePackage {
     name = "process-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
@@ -22585,12 +29935,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."process"."~0.8.0" =
+    self.by-version."process"."0.8.0";
   by-spec."progress"."1.1.4" =
     self.by-version."progress"."1.1.4";
   by-version."progress"."1.1.4" = self.buildNodePackage {
     name = "progress-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/progress/-/progress-1.1.4.tgz";
@@ -22599,12 +29956,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."progress"."1.1.8" =
     self.by-version."progress"."1.1.8";
   by-version."progress"."1.1.8" = self.buildNodePackage {
     name = "progress-1.1.8";
+    version = "1.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
@@ -22613,12 +29975,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."promiscuous"."^0.6.0" =
     self.by-version."promiscuous"."0.6.0";
   by-version."promiscuous"."0.6.0" = self.buildNodePackage {
     name = "promiscuous-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
@@ -22627,12 +29994,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."promise"."^6.0.1" =
     self.by-version."promise"."6.1.0";
   by-version."promise"."6.1.0" = self.buildNodePackage {
     name = "promise-6.1.0";
+    version = "6.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
@@ -22642,12 +30014,17 @@
     deps = {
       "asap-1.0.0" = self.by-version."asap"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = self.buildNodePackage {
     name = "promise-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
@@ -22657,12 +30034,17 @@
     deps = {
       "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."prompt"."0.2.14" =
     self.by-version."prompt"."0.2.14";
   by-version."prompt"."0.2.14" = self.buildNodePackage {
     name = "prompt-0.2.14";
+    version = "0.2.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
@@ -22676,7 +30058,11 @@
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."prompt"."0.2.x" =
     self.by-version."prompt"."0.2.14";
@@ -22684,6 +30070,7 @@
     self.by-version."promptly"."0.2.0";
   by-version."promptly"."0.2.0" = self.buildNodePackage {
     name = "promptly-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
@@ -22693,12 +30080,17 @@
     deps = {
       "read-1.0.5" = self.by-version."read"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."promzard"."~0.2.0" =
     self.by-version."promzard"."0.2.2";
   by-version."promzard"."0.2.2" = self.buildNodePackage {
     name = "promzard-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
@@ -22708,12 +30100,17 @@
     deps = {
       "read-1.0.5" = self.by-version."read"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."properties-parser"."0.2.3" =
     self.by-version."properties-parser"."0.2.3";
   by-version."properties-parser"."0.2.3" = self.buildNodePackage {
     name = "properties-parser-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz";
@@ -22722,12 +30119,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."proto-list"."~1.2.1" =
     self.by-version."proto-list"."1.2.3";
   by-version."proto-list"."1.2.3" = self.buildNodePackage {
     name = "proto-list-1.2.3";
+    version = "1.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
@@ -22736,12 +30138,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."protobufjs"."^3.2.2" =
     self.by-version."protobufjs"."3.8.2";
   by-version."protobufjs"."3.8.2" = self.buildNodePackage {
     name = "protobufjs-3.8.2";
+    version = "3.8.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz";
@@ -22752,12 +30159,17 @@
       "bytebuffer-3.5.4" = self.by-version."bytebuffer"."3.5.4";
       "ascli-0.3.0" = self.by-version."ascli"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."proxy-addr"."1.0.1" =
     self.by-version."proxy-addr"."1.0.1";
   by-version."proxy-addr"."1.0.1" = self.buildNodePackage {
     name = "proxy-addr-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
@@ -22767,12 +30179,17 @@
     deps = {
       "ipaddr.js-0.1.2" = self.by-version."ipaddr.js"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."proxy-addr"."~1.0.3" =
     self.by-version."proxy-addr"."1.0.6";
   by-version."proxy-addr"."1.0.6" = self.buildNodePackage {
     name = "proxy-addr-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.6.tgz";
@@ -22783,7 +30200,11 @@
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
       "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."proxy-addr"."~1.0.5" =
     self.by-version."proxy-addr"."1.0.6";
@@ -22793,6 +30214,7 @@
     self.by-version."proxy-agent"."1.1.0";
   by-version."proxy-agent"."1.1.0" = self.buildNodePackage {
     name = "proxy-agent-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-1.1.0.tgz";
@@ -22806,7 +30228,11 @@
       "socks-proxy-agent-0.1.2" = self.by-version."socks-proxy-agent"."0.1.2";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."proxy-agent"."~1.1.0" =
     self.by-version."proxy-agent"."1.1.0";
@@ -22814,6 +30240,7 @@
     self.by-version."prr"."0.0.0";
   by-version."prr"."0.0.0" = self.buildNodePackage {
     name = "prr-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
@@ -22822,12 +30249,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
   by-version."ps-tree"."0.0.3" = self.buildNodePackage {
     name = "ps-tree-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
@@ -22837,7 +30269,11 @@
     deps = {
       "event-stream-0.5.3" = self.by-version."event-stream"."0.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ps-tree"."~0.0.3" =
     self.by-version."ps-tree"."0.0.3";
@@ -22845,6 +30281,7 @@
     self.by-version."public-address"."0.1.1";
   by-version."public-address"."0.1.1" = self.buildNodePackage {
     name = "public-address-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/public-address/-/public-address-0.1.1.tgz";
@@ -22853,12 +30290,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."public-encrypt"."1.1.2" =
     self.by-version."public-encrypt"."1.1.2";
   by-version."public-encrypt"."1.1.2" = self.buildNodePackage {
     name = "public-encrypt-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.1.2.tgz";
@@ -22870,12 +30312,17 @@
       "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1";
       "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pump"."^0.3.1" =
     self.by-version."pump"."0.3.5";
   by-version."pump"."0.3.5" = self.buildNodePackage {
     name = "pump-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
@@ -22886,7 +30333,11 @@
       "once-1.2.0" = self.by-version."once"."1.2.0";
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pump"."^0.3.5" =
     self.by-version."pump"."0.3.5";
@@ -22896,6 +30347,7 @@
     self.by-version."punycode"."1.3.2";
   by-version."punycode"."1.3.2" = self.buildNodePackage {
     name = "punycode-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
@@ -22904,7 +30356,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."punycode".">=0.2.0" =
     self.by-version."punycode"."1.3.2";
@@ -22912,6 +30368,7 @@
     self.by-version."punycode"."1.0.0";
   by-version."punycode"."1.0.0" = self.buildNodePackage {
     name = "punycode-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
@@ -22920,12 +30377,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."punycode"."^1.2.4" =
+    self.by-version."punycode"."1.3.2";
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
   by-version."punycode"."1.2.4" = self.buildNodePackage {
     name = "punycode-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
@@ -22934,7 +30398,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."punycode"."~1.2.4" =
     self.by-version."punycode"."1.2.4";
@@ -22942,6 +30410,7 @@
     self.by-version."pure-css"."0.5.0-rc-1";
   by-version."pure"."0.5.0-rc-1" = self.buildNodePackage {
     name = "pure-0.5.0-rc-1";
+    version = "0.5.0-rc-1";
     bin = false;
     src = fetchgit {
       url = "git://github.com/yui/pure.git";
@@ -22950,13 +30419,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "pure-css" = self.by-version."pure"."0.5.0-rc-1";
   by-spec."pusher"."^1.0.0" =
     self.by-version."pusher"."1.0.4";
   by-version."pusher"."1.0.4" = self.buildNodePackage {
     name = "pusher-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pusher/-/pusher-1.0.4.tgz";
@@ -22966,12 +30440,17 @@
     deps = {
       "request-2.45.0" = self.by-version."request"."2.45.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."q"."0.9.7" =
     self.by-version."q"."0.9.7";
   by-version."q"."0.9.7" = self.buildNodePackage {
     name = "q-0.9.7";
+    version = "0.9.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
@@ -22980,12 +30459,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."q"."1.0.1" =
     self.by-version."q"."1.0.1";
   by-version."q"."1.0.1" = self.buildNodePackage {
     name = "q-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
@@ -22994,12 +30478,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."2.0.3";
   by-version."q"."2.0.3" = self.buildNodePackage {
     name = "q-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/q/-/q-2.0.3.tgz";
@@ -23011,24 +30500,33 @@
       "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1";
       "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."q"."^1.0.1" =
-    self.by-version."q"."1.1.2";
-  by-version."q"."1.1.2" = self.buildNodePackage {
-    name = "q-1.1.2";
+    self.by-version."q"."1.2.0";
+  by-version."q"."1.2.0" = self.buildNodePackage {
+    name = "q-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz";
-      name = "q-1.1.2.tgz";
-      sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89";
+      url = "http://registry.npmjs.org/q/-/q-1.2.0.tgz";
+      name = "q-1.2.0.tgz";
+      sha1 = "811705ce4a9802adff811ab0fcdbd01946e1fe22";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."q"."^1.1.2" =
-    self.by-version."q"."1.1.2";
+    self.by-version."q"."1.2.0";
   by-spec."q"."~0.9.2" =
     self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.6" =
@@ -23041,10 +30539,28 @@
     self.by-version."q"."1.0.1";
   by-spec."q"."~1.1.2" =
     self.by-version."q"."1.1.2";
+  by-version."q"."1.1.2" = self.buildNodePackage {
+    name = "q-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz";
+      name = "q-1.1.2.tgz";
+      sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."qap"."^3.1.2" =
     self.by-version."qap"."3.1.3";
   by-version."qap"."3.1.3" = self.buildNodePackage {
     name = "qap-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qap/-/qap-3.1.3.tgz";
@@ -23053,12 +30569,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = self.buildNodePackage {
     name = "qs-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
@@ -23067,7 +30588,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.4.x" =
     self.by-version."qs"."0.4.2";
@@ -23075,6 +30600,7 @@
     self.by-version."qs"."0.5.1";
   by-version."qs"."0.5.1" = self.buildNodePackage {
     name = "qs-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
@@ -23083,12 +30609,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.5.5" =
     self.by-version."qs"."0.5.5";
   by-version."qs"."0.5.5" = self.buildNodePackage {
     name = "qs-0.5.5";
+    version = "0.5.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
@@ -23097,12 +30628,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.5.x" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = self.buildNodePackage {
     name = "qs-0.5.6";
+    version = "0.5.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
@@ -23111,12 +30647,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.6.5" =
     self.by-version."qs"."0.6.5";
   by-version."qs"."0.6.5" = self.buildNodePackage {
     name = "qs-0.6.5";
+    version = "0.6.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
@@ -23125,12 +30666,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."0.6.6" =
     self.by-version."qs"."0.6.6";
   by-version."qs"."0.6.6" = self.buildNodePackage {
     name = "qs-0.6.6";
+    version = "0.6.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
@@ -23139,12 +30685,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."1.2.0" =
     self.by-version."qs"."1.2.0";
   by-version."qs"."1.2.0" = self.buildNodePackage {
     name = "qs-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
@@ -23153,12 +30704,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."2.2.3" =
+    self.by-version."qs"."2.2.3";
+  by-version."qs"."2.2.3" = self.buildNodePackage {
+    name = "qs-2.2.3";
+    version = "2.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz";
+      name = "qs-2.2.3.tgz";
+      sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."2.2.4" =
     self.by-version."qs"."2.2.4";
   by-version."qs"."2.2.4" = self.buildNodePackage {
     name = "qs-2.2.4";
+    version = "2.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz";
@@ -23167,12 +30742,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."2.3.2" =
     self.by-version."qs"."2.3.2";
   by-version."qs"."2.3.2" = self.buildNodePackage {
     name = "qs-2.3.2";
+    version = "2.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz";
@@ -23181,12 +30761,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."2.3.3" =
     self.by-version."qs"."2.3.3";
   by-version."qs"."2.3.3" = self.buildNodePackage {
     name = "qs-2.3.3";
+    version = "2.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
@@ -23195,7 +30780,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs".">= 0.4.0" =
     self.by-version."qs"."2.3.3";
@@ -23207,6 +30796,7 @@
     self.by-version."qs"."1.0.2";
   by-version."qs"."1.0.2" = self.buildNodePackage {
     name = "qs-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
@@ -23215,12 +30805,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."~1.2.0" =
     self.by-version."qs"."1.2.2";
   by-version."qs"."1.2.2" = self.buildNodePackage {
     name = "qs-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
@@ -23229,7 +30824,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."~1.2.2" =
     self.by-version."qs"."1.2.2";
@@ -23237,6 +30836,7 @@
     self.by-version."qs"."2.2.5";
   by-version."qs"."2.2.5" = self.buildNodePackage {
     name = "qs-2.2.5";
+    version = "2.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/qs/-/qs-2.2.5.tgz";
@@ -23245,7 +30845,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."qs"."~2.3.1" =
     self.by-version."qs"."2.3.3";
@@ -23253,6 +30857,7 @@
     self.by-version."query-string"."1.0.0";
   by-version."query-string"."1.0.0" = self.buildNodePackage {
     name = "query-string-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/query-string/-/query-string-1.0.0.tgz";
@@ -23261,12 +30866,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."querystring".">=0.1.0 <0.2.0" =
     self.by-version."querystring"."0.1.0";
   by-version."querystring"."0.1.0" = self.buildNodePackage {
     name = "querystring-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
@@ -23275,12 +30885,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
     self.by-version."querystring"."0.2.0";
   by-version."querystring"."0.2.0" = self.buildNodePackage {
     name = "querystring-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
@@ -23289,12 +30904,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."querystring-es3"."~0.2.0" =
     self.by-version."querystring-es3"."0.2.1";
   by-version."querystring-es3"."0.2.1" = self.buildNodePackage {
     name = "querystring-es3-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
@@ -23303,12 +30923,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rai"."~0.1.11" =
     self.by-version."rai"."0.1.12";
   by-version."rai"."0.1.12" = self.buildNodePackage {
     name = "rai-0.1.12";
+    version = "0.1.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rai/-/rai-0.1.12.tgz";
@@ -23317,12 +30942,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rainbowsocks"."~0.1.2" =
     self.by-version."rainbowsocks"."0.1.2";
   by-version."rainbowsocks"."0.1.2" = self.buildNodePackage {
     name = "rainbowsocks-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz";
@@ -23332,12 +30962,17 @@
     deps = {
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."random-access-file"."^0.3.1" =
     self.by-version."random-access-file"."0.3.1";
   by-version."random-access-file"."0.3.1" = self.buildNodePackage {
     name = "random-access-file-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz";
@@ -23347,12 +30982,17 @@
     deps = {
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."randombytes"."^2.0.0" =
     self.by-version."randombytes"."2.0.1";
   by-version."randombytes"."2.0.1" = self.buildNodePackage {
     name = "randombytes-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz";
@@ -23361,12 +31001,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
   by-version."range-parser"."0.0.4" = self.buildNodePackage {
     name = "range-parser-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
@@ -23375,12 +31020,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."range-parser"."1.0.0" =
     self.by-version."range-parser"."1.0.0";
   by-version."range-parser"."1.0.0" = self.buildNodePackage {
     name = "range-parser-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
@@ -23389,12 +31039,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."range-parser"."^1.0.0" =
     self.by-version."range-parser"."1.0.2";
   by-version."range-parser"."1.0.2" = self.buildNodePackage {
     name = "range-parser-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
@@ -23403,7 +31058,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."range-parser"."^1.0.2" =
     self.by-version."range-parser"."1.0.2";
@@ -23415,6 +31074,7 @@
     self.by-version."raven"."0.7.2";
   by-version."raven"."0.7.2" = self.buildNodePackage {
     name = "raven-0.7.2";
+    version = "0.7.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz";
@@ -23427,12 +31087,17 @@
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."0.0.3" =
     self.by-version."raw-body"."0.0.3";
   by-version."raw-body"."0.0.3" = self.buildNodePackage {
     name = "raw-body-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
@@ -23441,12 +31106,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."1.1.4" =
     self.by-version."raw-body"."1.1.4";
   by-version."raw-body"."1.1.4" = self.buildNodePackage {
     name = "raw-body-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
@@ -23456,12 +31126,17 @@
     deps = {
       "bytes-0.3.0" = self.by-version."bytes"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."1.3.0" =
     self.by-version."raw-body"."1.3.0";
   by-version."raw-body"."1.3.0" = self.buildNodePackage {
     name = "raw-body-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
@@ -23472,12 +31147,17 @@
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."1.3.1" =
     self.by-version."raw-body"."1.3.1";
   by-version."raw-body"."1.3.1" = self.buildNodePackage {
     name = "raw-body-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz";
@@ -23488,12 +31168,17 @@
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."1.3.2" =
     self.by-version."raw-body"."1.3.2";
   by-version."raw-body"."1.3.2" = self.buildNodePackage {
     name = "raw-body-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.2.tgz";
@@ -23504,12 +31189,17 @@
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-body"."1.3.3" =
     self.by-version."raw-body"."1.3.3";
   by-version."raw-body"."1.3.3" = self.buildNodePackage {
     name = "raw-body-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz";
@@ -23520,12 +31210,17 @@
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = self.buildNodePackage {
     name = "raw-socket-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
@@ -23534,27 +31229,17 @@
     };
     deps = {
     };
-    peerDependencies = [];
-  };
-  by-spec."rbytes"."*" =
-    self.by-version."rbytes"."1.1.0";
-  by-version."rbytes"."1.1.0" = self.buildNodePackage {
-    name = "rbytes-1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz";
-      name = "rbytes-1.1.0.tgz";
-      sha1 = "50234097e70c079bcdf5227494311b1038f3d619";
-    };
-    deps = {
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "rbytes" = self.by-version."rbytes"."1.1.0";
   by-spec."rc"."0.5.2" =
     self.by-version."rc"."0.5.2";
   by-version."rc"."0.5.2" = self.buildNodePackage {
     name = "rc-0.5.2";
+    version = "0.5.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz";
@@ -23567,12 +31252,17 @@
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rc"."^0.4.0" =
     self.by-version."rc"."0.4.0";
   by-version."rc"."0.4.0" = self.buildNodePackage {
     name = "rc-0.4.0";
+    version = "0.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
@@ -23585,34 +31275,17 @@
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."rc"."^0.5.1" =
-    self.by-version."rc"."0.5.5";
-  by-version."rc"."0.5.5" = self.buildNodePackage {
-    name = "rc-0.5.5";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
-      name = "rc-0.5.5.tgz";
-      sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
-    };
-    deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."rc"."~0.5.0" =
-    self.by-version."rc"."0.5.5";
-  by-spec."rc"."~0.5.4" =
-    self.by-version."rc"."0.5.5";
-  by-spec."rc"."~0.6.0" =
+  by-spec."rc"."^0.6.0" =
     self.by-version."rc"."0.6.0";
   by-version."rc"."0.6.0" = self.buildNodePackage {
     name = "rc-0.6.0";
+    version = "0.6.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz";
@@ -23625,45 +31298,89 @@
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.3.3" = self.by-version."ini"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."rc"."~0.5.0" =
+    self.by-version."rc"."0.5.5";
+  by-version."rc"."0.5.5" = self.buildNodePackage {
+    name = "rc-0.5.5";
+    version = "0.5.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
+      name = "rc-0.5.5.tgz";
+      sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
+    };
+    deps = {
+      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
+      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rc"."~0.5.1" =
+    self.by-version."rc"."0.5.5";
+  by-spec."rc"."~0.5.4" =
+    self.by-version."rc"."0.5.5";
+  by-spec."rc"."~0.6.0" =
+    self.by-version."rc"."0.6.0";
   by-spec."react"."*" =
-    self.by-version."react"."0.13.0-beta.2";
-  by-version."react"."0.13.0-beta.2" = self.buildNodePackage {
-    name = "react-0.13.0-beta.2";
+    self.by-version."react"."0.13.0-rc1";
+  by-version."react"."0.13.0-rc1" = self.buildNodePackage {
+    name = "react-0.13.0-rc1";
+    version = "0.13.0-rc1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react/-/react-0.13.0-beta.2.tgz";
-      name = "react-0.13.0-beta.2.tgz";
-      sha1 = "94495988d861802afb9e4dc36acf387463c98614";
+      url = "http://registry.npmjs.org/react/-/react-0.13.0-rc1.tgz";
+      name = "react-0.13.0-rc1.tgz";
+      sha1 = "1773c4cf6b4f422b665eceb276345cfc030678ac";
     };
     deps = {
       "envify-3.2.0" = self.by-version."envify"."3.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "react" = self.by-version."react"."0.13.0-beta.2";
+  "react" = self.by-version."react"."0.13.0-rc1";
   by-spec."react-tools"."*" =
-    self.by-version."react-tools"."0.13.0-beta.2";
-  by-version."react-tools"."0.13.0-beta.2" = self.buildNodePackage {
-    name = "react-tools-0.13.0-beta.2";
+    self.by-version."react-tools"."0.13.0-rc1";
+  by-version."react-tools"."0.13.0-rc1" = self.buildNodePackage {
+    name = "react-tools-0.13.0-rc1";
+    version = "0.13.0-rc1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-beta.2.tgz";
-      name = "react-tools-0.13.0-beta.2.tgz";
-      sha1 = "d29e8d67a2d5fd1e4dba0fa4d068cc161a698e04";
+      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-rc1.tgz";
+      name = "react-tools-0.13.0-rc1.tgz";
+      sha1 = "f88bfc80115a5f831520409ccc269a9197001119";
     };
     deps = {
       "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
-      "jstransform-9.1.0" = self.by-version."jstransform"."9.1.0";
+      "jstransform-9.1.1" = self.by-version."jstransform"."9.1.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "react-tools" = self.by-version."react-tools"."0.13.0-beta.2";
+  "react-tools" = self.by-version."react-tools"."0.13.0-rc1";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = self.buildNodePackage {
     name = "read-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
@@ -23673,7 +31390,11 @@
     deps = {
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read"."1.0.x" =
     self.by-version."read"."1.0.5";
@@ -23685,6 +31406,7 @@
     self.by-version."read-all-stream"."1.0.2";
   by-version."read-all-stream"."1.0.2" = self.buildNodePackage {
     name = "read-all-stream-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-1.0.2.tgz";
@@ -23693,12 +31415,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-installed"."~2.0.5" =
     self.by-version."read-installed"."2.0.7";
   by-version."read-installed"."2.0.7" = self.buildNodePackage {
     name = "read-installed-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
@@ -23710,14 +31437,19 @@
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-installed"."~3.1.5" =
     self.by-version."read-installed"."3.1.5";
   by-version."read-installed"."3.1.5" = self.buildNodePackage {
     name = "read-installed-3.1.5";
+    version = "3.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz";
@@ -23731,14 +31463,19 @@
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-package-json"."1" =
     self.by-version."read-package-json"."1.3.1";
   by-version."read-package-json"."1.3.1" = self.buildNodePackage {
     name = "read-package-json-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.1.tgz";
@@ -23751,9 +31488,13 @@
       "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-package-json"."^1.3.1" =
     self.by-version."read-package-json"."1.3.1";
@@ -23761,6 +31502,7 @@
     self.by-version."read-package-json"."1.2.7";
   by-version."read-package-json"."1.2.7" = self.buildNodePackage {
     name = "read-package-json-1.2.7";
+    version = "1.2.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz";
@@ -23773,9 +31515,13 @@
       "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-package-json"."~1.3.1" =
     self.by-version."read-package-json"."1.3.1";
@@ -23783,6 +31529,7 @@
     self.by-version."read-torrent"."1.2.0";
   by-version."read-torrent"."1.2.0" = self.buildNodePackage {
     name = "read-torrent-1.2.0";
+    version = "1.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz";
@@ -23795,7 +31542,11 @@
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read-torrent"."^1.1.0" =
     self.by-version."read-torrent"."1.2.0";
@@ -23803,6 +31554,7 @@
     self.by-version."read-torrent"."1.0.0";
   by-version."read-torrent"."1.0.0" = self.buildNodePackage {
     name = "read-torrent-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz";
@@ -23814,12 +31566,17 @@
       "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0";
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readable-stream"."*" =
     self.by-version."readable-stream"."1.1.13";
   by-version."readable-stream"."1.1.13" = self.buildNodePackage {
     name = "readable-stream-1.1.13";
+    version = "1.1.13";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
@@ -23832,12 +31589,17 @@
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.33";
   by-version."readable-stream"."1.0.33" = self.buildNodePackage {
     name = "readable-stream-1.0.33";
+    version = "1.0.33";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
@@ -23850,12 +31612,17 @@
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readable-stream"."1.0.27-1" =
     self.by-version."readable-stream"."1.0.27-1";
   by-version."readable-stream"."1.0.27-1" = self.buildNodePackage {
     name = "readable-stream-1.0.27-1";
+    version = "1.0.27-1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
@@ -23868,12 +31635,17 @@
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readable-stream"."1.0.31" =
     self.by-version."readable-stream"."1.0.31";
   by-version."readable-stream"."1.0.31" = self.buildNodePackage {
     name = "readable-stream-1.0.31";
+    version = "1.0.31";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
@@ -23886,7 +31658,11 @@
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.13";
@@ -23902,6 +31678,8 @@
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.33-1" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^1.1.13" =
+    self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.1.13-1" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.0.17" =
@@ -23928,6 +31706,7 @@
     self.by-version."readable-wrap"."1.0.0";
   by-version."readable-wrap"."1.0.0" = self.buildNodePackage {
     name = "readable-wrap-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
@@ -23937,12 +31716,17 @@
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readdir-scoped-modules"."^1.0.0" =
     self.by-version."readdir-scoped-modules"."1.0.1";
   by-version."readdir-scoped-modules"."1.0.1" = self.buildNodePackage {
     name = "readdir-scoped-modules-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz";
@@ -23955,12 +31739,17 @@
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readdirp"."^1.2.0" =
     self.by-version."readdirp"."1.3.0";
   by-version."readdirp"."1.3.0" = self.buildNodePackage {
     name = "readdirp-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz";
@@ -23972,7 +31761,11 @@
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."readdirp"."^1.3.0" =
     self.by-version."readdirp"."1.3.0";
@@ -23980,6 +31773,7 @@
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = self.buildNodePackage {
     name = "readdirp-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
@@ -23989,12 +31783,19 @@
     deps = {
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."readdirp"."~1.3.0" =
+    self.by-version."readdirp"."1.3.0";
   by-spec."readline2"."~0.1.0" =
     self.by-version."readline2"."0.1.1";
   by-version."readline2"."0.1.1" = self.buildNodePackage {
     name = "readline2-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz";
@@ -24005,12 +31806,17 @@
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
       "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."realize-package-specifier"."~1.3.0" =
     self.by-version."realize-package-specifier"."1.3.0";
   by-version."realize-package-specifier"."1.3.0" = self.buildNodePackage {
     name = "realize-package-specifier-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz";
@@ -24021,31 +31827,40 @@
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
       "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."recast"."~0.6.5" =
-    self.by-version."recast"."0.6.10";
-  by-version."recast"."0.6.10" = self.buildNodePackage {
-    name = "recast-0.6.10";
+  by-spec."recast"."~0.10.0" =
+    self.by-version."recast"."0.10.0";
+  by-version."recast"."0.10.0" = self.buildNodePackage {
+    name = "recast-0.10.0";
+    version = "0.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/recast/-/recast-0.6.10.tgz";
-      name = "recast-0.6.10.tgz";
-      sha1 = "3dd75f6e114503cb34f25459a7848c17f0dd2e95";
+      url = "http://registry.npmjs.org/recast/-/recast-0.10.0.tgz";
+      name = "recast-0.10.0.tgz";
+      sha1 = "5c5a57f15faffb2efefed70039fbeddec25629f9";
     };
     deps = {
-      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
-      "source-map-0.1.32" = self.by-version."source-map"."0.1.32";
+      "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
+      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "cls-0.1.5" = self.by-version."cls"."0.1.5";
-      "ast-types-0.4.13" = self.by-version."ast-types"."0.4.13";
+      "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."recast"."~0.9.5" =
     self.by-version."recast"."0.9.18";
   by-version."recast"."0.9.18" = self.buildNodePackage {
     name = "recast-0.9.18";
+    version = "0.9.18";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/recast/-/recast-0.9.18.tgz";
@@ -24056,14 +31871,19 @@
       "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "ast-types-0.6.12" = self.by-version."ast-types"."0.6.12";
+      "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."reconnect-core"."https://github.com/dodo/reconnect-core/tarball/merged" =
     self.by-version."reconnect-core"."0.0.1";
   by-version."reconnect-core"."0.0.1" = self.buildNodePackage {
     name = "reconnect-core-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "https://github.com/dodo/reconnect-core/tarball/merged";
@@ -24073,12 +31893,17 @@
     deps = {
       "backoff-2.3.0" = self.by-version."backoff"."2.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."redeyed"."~0.4.0" =
     self.by-version."redeyed"."0.4.4";
   by-version."redeyed"."0.4.4" = self.buildNodePackage {
     name = "redeyed-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
@@ -24088,12 +31913,17 @@
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."redis"."*" =
     self.by-version."redis"."0.12.1";
   by-version."redis"."0.12.1" = self.buildNodePackage {
     name = "redis-0.12.1";
+    version = "0.12.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
@@ -24102,13 +31932,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "redis" = self.by-version."redis"."0.12.1";
   by-spec."redis"."0.10.x" =
     self.by-version."redis"."0.10.3";
   by-version."redis"."0.10.3" = self.buildNodePackage {
     name = "redis-0.10.3";
+    version = "0.10.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
@@ -24117,12 +31952,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."redis"."0.7.3" =
     self.by-version."redis"."0.7.3";
   by-version."redis"."0.7.3" = self.buildNodePackage {
     name = "redis-0.7.3";
+    version = "0.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
@@ -24131,7 +31971,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."redis"."^0.12.1" =
     self.by-version."redis"."0.12.1";
@@ -24141,6 +31985,7 @@
     self.by-version."reds"."0.2.5";
   by-version."reds"."0.2.5" = self.buildNodePackage {
     name = "reds-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/reds/-/reds-0.2.5.tgz";
@@ -24151,12 +31996,17 @@
       "natural-0.2.0" = self.by-version."natural"."0.2.0";
       "redis-0.12.1" = self.by-version."redis"."0.12.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."reduce-component"."1.0.1" =
     self.by-version."reduce-component"."1.0.1";
   by-version."reduce-component"."1.0.1" = self.buildNodePackage {
     name = "reduce-component-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
@@ -24165,31 +32015,42 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."regenerator"."~0.4.7" =
-    self.by-version."regenerator"."0.4.12";
-  by-version."regenerator"."0.4.12" = self.buildNodePackage {
-    name = "regenerator-0.4.12";
+  by-spec."regenerator"."~0.8.13" =
+    self.by-version."regenerator"."0.8.14";
+  by-version."regenerator"."0.8.14" = self.buildNodePackage {
+    name = "regenerator-0.8.14";
+    version = "0.8.14";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.4.12.tgz";
-      name = "regenerator-0.4.12.tgz";
-      sha1 = "1b056b8c24583c5d9c71abb42bbb61b682dbb867";
+      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.8.14.tgz";
+      name = "regenerator-0.8.14.tgz";
+      sha1 = "29736fb2a8ceaaaeee0049c1babf514cace670f0";
     };
     deps = {
-      "commander-2.1.0" = self.by-version."commander"."2.1.0";
-      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
-      "recast-0.6.10" = self.by-version."recast"."0.6.10";
+      "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
+      "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
+      "recast-0.10.0" = self.by-version."recast"."0.10.0";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "defs-0.6.2" = self.by-version."defs"."0.6.2";
+      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "defs-1.1.0" = self.by-version."defs"."1.1.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."regexp-clone"."0.0.1" =
     self.by-version."regexp-clone"."0.0.1";
   by-version."regexp-clone"."0.0.1" = self.buildNodePackage {
     name = "regexp-clone-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
@@ -24198,12 +32059,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."registry-url"."^0.1.0" =
     self.by-version."registry-url"."0.1.1";
   by-version."registry-url"."0.1.1" = self.buildNodePackage {
     name = "registry-url-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz";
@@ -24213,27 +32079,37 @@
     deps = {
       "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."registry-url"."^2.0.0" =
-    self.by-version."registry-url"."2.1.0";
-  by-version."registry-url"."2.1.0" = self.buildNodePackage {
-    name = "registry-url-2.1.0";
+  by-spec."registry-url"."^3.0.0" =
+    self.by-version."registry-url"."3.0.0";
+  by-version."registry-url"."3.0.0" = self.buildNodePackage {
+    name = "registry-url-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/registry-url/-/registry-url-2.1.0.tgz";
-      name = "registry-url-2.1.0.tgz";
-      sha1 = "f9624c877b43946af540849ba772ed704d606f7a";
+      url = "http://registry.npmjs.org/registry-url/-/registry-url-3.0.0.tgz";
+      name = "registry-url-3.0.0.tgz";
+      sha1 = "8914166605792d03bdd11b05cd00b2b7688c3849";
     };
     deps = {
-      "rc-0.5.5" = self.by-version."rc"."0.5.5";
+      "rc-0.6.0" = self.by-version."rc"."0.6.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."repeating"."^1.1.0" =
     self.by-version."repeating"."1.1.2";
   by-version."repeating"."1.1.2" = self.buildNodePackage {
     name = "repeating-1.1.2";
+    version = "1.1.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz";
@@ -24244,12 +32120,17 @@
       "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0";
       "meow-3.0.0" = self.by-version."meow"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."replace"."~0.2.4" =
     self.by-version."replace"."0.2.10";
   by-version."replace"."0.2.10" = self.buildNodePackage {
     name = "replace-0.2.10";
+    version = "0.2.10";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
@@ -24261,12 +32142,17 @@
       "colors-0.5.1" = self.by-version."colors"."0.5.1";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."replace-ext"."0.0.1" =
     self.by-version."replace-ext"."0.0.1";
   by-version."replace-ext"."0.0.1" = self.buildNodePackage {
     name = "replace-ext-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
@@ -24275,12 +32161,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2" =
     self.by-version."request"."2.53.0";
   by-version."request"."2.53.0" = self.buildNodePackage {
     name = "request-2.53.0";
+    version = "2.53.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz";
@@ -24306,7 +32197,11 @@
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2 >=2.20.0" =
     self.by-version."request"."2.53.0";
@@ -24316,6 +32211,7 @@
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = self.buildNodePackage {
     name = "request-2.16.6";
+    version = "2.16.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
@@ -24335,12 +32231,17 @@
       "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0";
       "qs-0.5.6" = self.by-version."qs"."0.5.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.26.x" =
     self.by-version."request"."2.26.0";
   by-version."request"."2.26.0" = self.buildNodePackage {
     name = "request-2.26.0";
+    version = "2.26.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
@@ -24361,12 +32262,17 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.27.x" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = self.buildNodePackage {
     name = "request-2.27.0";
+    version = "2.27.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
@@ -24387,12 +32293,17 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.29.0" =
     self.by-version."request"."2.29.0";
   by-version."request"."2.29.0" = self.buildNodePackage {
     name = "request-2.29.0";
+    version = "2.29.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz";
@@ -24405,6 +32316,8 @@
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
+    };
+    optionalDependencies = {
       "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
@@ -24414,11 +32327,14 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.36.0" =
     self.by-version."request"."2.36.0";
   by-version."request"."2.36.0" = self.buildNodePackage {
     name = "request-2.36.0";
+    version = "2.36.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
@@ -24431,6 +32347,8 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+    };
+    optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
@@ -24440,11 +32358,14 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.40.0" =
     self.by-version."request"."2.40.0";
   by-version."request"."2.40.0" = self.buildNodePackage {
     name = "request-2.40.0";
+    version = "2.40.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
@@ -24457,6 +32378,8 @@
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+    };
+    optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
@@ -24467,11 +32390,14 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.42.0" =
     self.by-version."request"."2.42.0";
   by-version."request"."2.42.0" = self.buildNodePackage {
     name = "request-2.42.0";
+    version = "2.42.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
@@ -24487,6 +32413,8 @@
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+    };
+    optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
@@ -24496,11 +32424,14 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.47.0" =
     self.by-version."request"."2.47.0";
   by-version."request"."2.47.0" = self.buildNodePackage {
     name = "request-2.47.0";
+    version = "2.47.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz";
@@ -24525,12 +32456,17 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
   by-version."request"."2.9.203" = self.buildNodePackage {
     name = "request-2.9.203";
+    version = "2.9.203";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
@@ -24539,7 +32475,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."2.x" =
     self.by-version."request"."2.53.0";
@@ -24549,6 +32489,7 @@
     self.by-version."request"."2.45.0";
   by-version."request"."2.45.0" = self.buildNodePackage {
     name = "request-2.45.0";
+    version = "2.45.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz";
@@ -24565,6 +32506,8 @@
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+    };
+    optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
@@ -24573,6 +32516,8 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request".">= 2.2.9" =
     self.by-version."request"."2.53.0";
@@ -24604,6 +32549,7 @@
     self.by-version."request"."2.34.0";
   by-version."request"."2.34.0" = self.buildNodePackage {
     name = "request-2.34.0";
+    version = "2.34.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
@@ -24616,6 +32562,8 @@
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
+    };
+    optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
@@ -24625,6 +32573,8 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."~2.40.0" =
     self.by-version."request"."2.40.0";
@@ -24634,6 +32584,7 @@
     self.by-version."request"."2.46.0";
   by-version."request"."2.46.0" = self.buildNodePackage {
     name = "request-2.46.0";
+    version = "2.46.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz";
@@ -24657,12 +32608,17 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."~2.48.0" =
     self.by-version."request"."2.48.0";
   by-version."request"."2.48.0" = self.buildNodePackage {
     name = "request-2.48.0";
+    version = "2.48.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz";
@@ -24687,12 +32643,17 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."~2.51.0" =
     self.by-version."request"."2.51.0";
   by-version."request"."2.51.0" = self.buildNodePackage {
     name = "request-2.51.0";
+    version = "2.51.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
@@ -24717,7 +32678,11 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request"."~2.53.0" =
     self.by-version."request"."2.53.0";
@@ -24725,6 +32690,7 @@
     self.by-version."request-progress"."0.3.0";
   by-version."request-progress"."0.3.0" = self.buildNodePackage {
     name = "request-progress-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz";
@@ -24734,12 +32700,17 @@
     deps = {
       "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request-progress"."0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
     name = "request-progress-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
@@ -24749,12 +32720,17 @@
     deps = {
       "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."request-replay"."~0.2.0" =
     self.by-version."request-replay"."0.2.0";
   by-version."request-replay"."0.2.0" = self.buildNodePackage {
     name = "request-replay-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
@@ -24764,12 +32740,17 @@
     deps = {
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."requirejs"."~2.1" =
     self.by-version."requirejs"."2.1.16";
   by-version."requirejs"."2.1.16" = self.buildNodePackage {
     name = "requirejs-2.1.16";
+    version = "2.1.16";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.16.tgz";
@@ -24778,7 +32759,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."requirejs"."~2.1.0" =
     self.by-version."requirejs"."2.1.16";
@@ -24786,6 +32771,7 @@
     self.by-version."resanitize"."0.3.0";
   by-version."resanitize"."0.3.0" = self.buildNodePackage {
     name = "resanitize-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz";
@@ -24795,12 +32781,17 @@
     deps = {
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."resolve"."0.6.3" =
     self.by-version."resolve"."0.6.3";
   by-version."resolve"."0.6.3" = self.buildNodePackage {
     name = "resolve-0.6.3";
+    version = "0.6.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
@@ -24809,12 +32800,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."resolve"."0.7.x" =
     self.by-version."resolve"."0.7.4";
   by-version."resolve"."0.7.4" = self.buildNodePackage {
     name = "resolve-0.7.4";
+    version = "0.7.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
@@ -24823,40 +32819,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."resolve"."1.1.0" =
-    self.by-version."resolve"."1.1.0";
-  by-version."resolve"."1.1.0" = self.buildNodePackage {
-    name = "resolve-1.1.0";
+  by-spec."resolve"."1.1.5" =
+    self.by-version."resolve"."1.1.5";
+  by-version."resolve"."1.1.5" = self.buildNodePackage {
+    name = "resolve-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.0.tgz";
-      name = "resolve-1.1.0.tgz";
-      sha1 = "f9ad602751ed06a13e58cf1eaa1565bbe38d6d93";
+      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.5.tgz";
+      name = "resolve-1.1.5.tgz";
+      sha1 = "3b74c0c44cdf5eee32322b2cda0a4acbf6970fa7";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."resolve"."^1.1.3" =
-    self.by-version."resolve"."1.1.3";
-  by-version."resolve"."1.1.3" = self.buildNodePackage {
-    name = "resolve-1.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.3.tgz";
-      name = "resolve-1.1.3.tgz";
-      sha1 = "0c23ca8cac81c192ac30399489c3185f2b42da9c";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
+    self.by-version."resolve"."1.1.5";
+  by-spec."resolve"."^1.1.4" =
+    self.by-version."resolve"."1.1.5";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = self.buildNodePackage {
     name = "resolve-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
@@ -24865,7 +32861,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
@@ -24877,6 +32877,7 @@
     self.by-version."resolve"."1.0.0";
   by-version."resolve"."1.0.0" = self.buildNodePackage {
     name = "resolve-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz";
@@ -24885,12 +32886,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."response-time"."1.0.0" =
     self.by-version."response-time"."1.0.0";
   by-version."response-time"."1.0.0" = self.buildNodePackage {
     name = "response-time-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
@@ -24899,12 +32905,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."response-time"."~2.0.1" =
     self.by-version."response-time"."2.0.1";
   by-version."response-time"."2.0.1" = self.buildNodePackage {
     name = "response-time-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
@@ -24914,28 +32925,17 @@
     deps = {
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."response-time"."~2.2.0" =
-    self.by-version."response-time"."2.2.0";
-  by-version."response-time"."2.2.0" = self.buildNodePackage {
-    name = "response-time-2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz";
-      name = "response-time-2.2.0.tgz";
-      sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb";
-    };
-    deps = {
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."response-time"."~2.3.0" =
     self.by-version."response-time"."2.3.0";
   by-version."response-time"."2.3.0" = self.buildNodePackage {
     name = "response-time-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz";
@@ -24946,12 +32946,17 @@
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."restify"."2.4.1" =
     self.by-version."restify"."2.4.1";
   by-version."restify"."2.4.1" = self.buildNodePackage {
     name = "restify-2.4.1";
+    version = "2.4.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
@@ -24975,14 +32980,19 @@
       "semver-1.1.4" = self.by-version."semver"."1.1.4";
       "spdy-1.7.1" = self.by-version."spdy"."1.7.1";
       "verror-1.3.6" = self.by-version."verror"."1.3.6";
+    };
+    optionalDependencies = {
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ret"."~0.1.6" =
     self.by-version."ret"."0.1.10";
   by-version."ret"."0.1.10" = self.buildNodePackage {
     name = "ret-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ret/-/ret-0.1.10.tgz";
@@ -24991,28 +33001,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.16.0";
-  by-version."rethinkdb"."1.16.0" = self.buildNodePackage {
-    name = "rethinkdb-1.16.0";
+    self.by-version."rethinkdb"."1.16.1";
+  by-version."rethinkdb"."1.16.1" = self.buildNodePackage {
+    name = "rethinkdb-1.16.1";
+    version = "1.16.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.0.tgz";
-      name = "rethinkdb-1.16.0.tgz";
-      sha1 = "530e5ace0f4bce7c7543236e7bd39aead7ea7e1d";
+      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.1.tgz";
+      name = "rethinkdb-1.16.1.tgz";
+      sha1 = "b18d6cbea75564bffdc14f972369d20f5c35b9e6";
     };
     deps = {
-      "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9";
+      "bluebird-2.9.12" = self.by-version."bluebird"."2.9.12";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.16.0";
+  "rethinkdb" = self.by-version."rethinkdb"."1.16.1";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
     name = "retry-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
@@ -25021,12 +33041,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."retry"."^0.6.1" =
     self.by-version."retry"."0.6.1";
   by-version."retry"."0.6.1" = self.buildNodePackage {
     name = "retry-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
@@ -25035,7 +33060,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.1";
@@ -25045,6 +33074,7 @@
     self.by-version."revalidator"."0.1.8";
   by-version."revalidator"."0.1.8" = self.buildNodePackage {
     name = "revalidator-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
@@ -25053,12 +33083,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rfile"."~1.0" =
     self.by-version."rfile"."1.0.0";
   by-version."rfile"."1.0.0" = self.buildNodePackage {
     name = "rfile-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
@@ -25069,7 +33104,11 @@
       "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
       "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rfile"."~1.0.0" =
     self.by-version."rfile"."1.0.0";
@@ -25077,6 +33116,7 @@
     self.by-version."rimraf"."1.0.9";
   by-version."rimraf"."1.0.9" = self.buildNodePackage {
     name = "rimraf-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
@@ -25085,12 +33125,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rimraf"."2" =
     self.by-version."rimraf"."2.2.8";
   by-version."rimraf"."2.2.8" = self.buildNodePackage {
     name = "rimraf-2.2.8";
+    version = "2.2.8";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
@@ -25099,12 +33144,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rimraf"."2.2.6" =
     self.by-version."rimraf"."2.2.6";
   by-version."rimraf"."2.2.6" = self.buildNodePackage {
     name = "rimraf-2.2.6";
+    version = "2.2.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
@@ -25113,7 +33163,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rimraf"."2.x.x" =
     self.by-version."rimraf"."2.2.8";
@@ -25129,6 +33183,7 @@
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = self.buildNodePackage {
     name = "rimraf-2.1.4";
+    version = "2.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
@@ -25136,9 +33191,13 @@
       sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
     };
     deps = {
+    };
+    optionalDependencies = {
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rimraf"."~2.2.0" =
     self.by-version."rimraf"."2.2.8";
@@ -25148,10 +33207,30 @@
     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" = self.buildNodePackage {
+    name = "ripemd160-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
+      name = "ripemd160-0.2.0.tgz";
+      sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ripemd160"."^1.0.0" =
     self.by-version."ripemd160"."1.0.0";
   by-version."ripemd160"."1.0.0" = self.buildNodePackage {
     name = "ripemd160-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz";
@@ -25160,12 +33239,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rndm"."~1.1.0" =
     self.by-version."rndm"."1.1.0";
   by-version."rndm"."1.1.0" = self.buildNodePackage {
     name = "rndm-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz";
@@ -25174,12 +33258,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."router"."^0.6.2" =
     self.by-version."router"."0.6.2";
   by-version."router"."0.6.2" = self.buildNodePackage {
     name = "router-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/router/-/router-0.6.2.tgz";
@@ -25188,12 +33277,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rss".">=0.2.1" =
     self.by-version."rss"."1.1.1";
   by-version."rss"."1.1.1" = self.buildNodePackage {
     name = "rss-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rss/-/rss-1.1.1.tgz";
@@ -25204,12 +33298,17 @@
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
       "xml-1.0.0" = self.by-version."xml"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ruglify"."~1.0.0" =
     self.by-version."ruglify"."1.0.0";
   by-version."ruglify"."1.0.0" = self.buildNodePackage {
     name = "ruglify-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
@@ -25220,12 +33319,17 @@
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."run-applescript"."^1.0.0" =
     self.by-version."run-applescript"."1.0.1";
   by-version."run-applescript"."1.0.1" = self.buildNodePackage {
     name = "run-applescript-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz";
@@ -25234,7 +33338,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."run-applescript"."^1.0.1" =
     self.by-version."run-applescript"."1.0.1";
@@ -25242,6 +33350,7 @@
     self.by-version."run-parallel"."1.0.0";
   by-version."run-parallel"."1.0.0" = self.buildNodePackage {
     name = "run-parallel-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz";
@@ -25250,12 +33359,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."run-series"."^1.0.2" =
     self.by-version."run-series"."1.0.2";
   by-version."run-series"."1.0.2" = self.buildNodePackage {
     name = "run-series-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz";
@@ -25264,12 +33378,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."runforcover"."~0.0.2" =
     self.by-version."runforcover"."0.0.2";
   by-version."runforcover"."0.0.2" = self.buildNodePackage {
     name = "runforcover-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
@@ -25279,12 +33398,17 @@
     deps = {
       "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rusha-browserify"."^0.7.3" =
     self.by-version."rusha-browserify"."0.7.3";
   by-version."rusha-browserify"."0.7.3" = self.buildNodePackage {
     name = "rusha-browserify-0.7.3";
+    version = "0.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz";
@@ -25293,26 +33417,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."rx"."^2.2.27" =
-    self.by-version."rx"."2.3.25";
-  by-version."rx"."2.3.25" = self.buildNodePackage {
-    name = "rx-2.3.25";
+    self.by-version."rx"."2.4.0";
+  by-version."rx"."2.4.0" = self.buildNodePackage {
+    name = "rx-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rx/-/rx-2.3.25.tgz";
-      name = "rx-2.3.25.tgz";
-      sha1 = "2f7c0550532777b41fa692bb790a7886eaff9731";
+      url = "http://registry.npmjs.org/rx/-/rx-2.4.0.tgz";
+      name = "rx-2.4.0.tgz";
+      sha1 = "8cd40d4fb393d43851286f4b22aa7db60ac92fe1";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.5";
   by-version."s3http"."0.0.5" = self.buildNodePackage {
     name = "s3http-0.0.5";
+    version = "0.0.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
@@ -25329,13 +33463,18 @@
       "util-0.4.9" = self.by-version."util"."0.4.9";
       "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
   by-spec."safe-regex"."0.0.1" =
     self.by-version."safe-regex"."0.0.1";
   by-version."safe-regex"."0.0.1" = self.buildNodePackage {
     name = "safe-regex-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/safe-regex/-/safe-regex-0.0.1.tgz";
@@ -25345,12 +33484,17 @@
     deps = {
       "ret-0.1.10" = self.by-version."ret"."0.1.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."samsam"."~1.1" =
     self.by-version."samsam"."1.1.2";
   by-version."samsam"."1.1.2" = self.buildNodePackage {
     name = "samsam-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
@@ -25359,12 +33503,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sauce-connect-launcher"."~0.6.0" =
     self.by-version."sauce-connect-launcher"."0.6.1";
   by-version."sauce-connect-launcher"."0.6.1" = self.buildNodePackage {
     name = "sauce-connect-launcher-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
@@ -25377,12 +33526,17 @@
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."saucelabs"."~0.1.0" =
     self.by-version."saucelabs"."0.1.1";
   by-version."saucelabs"."0.1.1" = self.buildNodePackage {
     name = "saucelabs-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
@@ -25391,12 +33545,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sax"."0.3.5" =
     self.by-version."sax"."0.3.5";
   by-version."sax"."0.3.5" = self.buildNodePackage {
     name = "sax-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
@@ -25405,12 +33564,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sax"."0.4.2" =
     self.by-version."sax"."0.4.2";
   by-version."sax"."0.4.2" = self.buildNodePackage {
     name = "sax-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
@@ -25419,12 +33583,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = self.buildNodePackage {
     name = "sax-0.5.8";
+    version = "0.5.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
@@ -25433,12 +33602,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sax"."0.6.x" =
     self.by-version."sax"."0.6.1";
   by-version."sax"."0.6.1" = self.buildNodePackage {
     name = "sax-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
@@ -25447,7 +33621,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sax".">=0.4.2" =
     self.by-version."sax"."0.6.1";
@@ -25457,6 +33635,7 @@
     self.by-version."scmp"."0.0.3";
   by-version."scmp"."0.0.3" = self.buildNodePackage {
     name = "scmp-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
@@ -25465,12 +33644,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."scmp"."1.0.0" =
     self.by-version."scmp"."1.0.0";
   by-version."scmp"."1.0.0" = self.buildNodePackage {
     name = "scmp-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
@@ -25479,7 +33663,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."scmp"."~0.0.3" =
     self.by-version."scmp"."0.0.3";
@@ -25489,6 +33677,7 @@
     self.by-version."selenium-webdriver"."2.44.0";
   by-version."selenium-webdriver"."2.44.0" = self.buildNodePackage {
     name = "selenium-webdriver-2.44.0";
+    version = "2.44.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz";
@@ -25500,13 +33689,18 @@
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0";
   by-spec."semver"."*" =
     self.by-version."semver"."4.3.0";
   by-version."semver"."4.3.0" = self.buildNodePackage {
     name = "semver-4.3.0";
+    version = "4.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-4.3.0.tgz";
@@ -25515,13 +33709,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "semver" = self.by-version."semver"."4.3.0";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = self.buildNodePackage {
     name = "semver-1.1.0";
+    version = "1.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
@@ -25530,12 +33729,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."1.1.4" =
     self.by-version."semver"."1.1.4";
   by-version."semver"."1.1.4" = self.buildNodePackage {
     name = "semver-1.1.4";
+    version = "1.1.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
@@ -25544,12 +33748,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."2" =
     self.by-version."semver"."2.3.2";
   by-version."semver"."2.3.2" = self.buildNodePackage {
     name = "semver-2.3.2";
+    version = "2.3.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
@@ -25558,7 +33767,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."2 >=2.2.1" =
     self.by-version."semver"."2.3.2";
@@ -25568,6 +33781,7 @@
     self.by-version."semver"."3.0.1";
   by-version."semver"."3.0.1" = self.buildNodePackage {
     name = "semver-3.0.1";
+    version = "3.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
@@ -25576,7 +33790,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."2 || 3 || 4" =
     self.by-version."semver"."4.3.0";
@@ -25584,6 +33802,7 @@
     self.by-version."semver"."2.0.11";
   by-version."semver"."2.0.11" = self.buildNodePackage {
     name = "semver-2.0.11";
+    version = "2.0.11";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
@@ -25592,7 +33811,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."2.x" =
     self.by-version."semver"."2.3.2";
@@ -25600,8 +33823,6 @@
     self.by-version."semver"."4.3.0";
   by-spec."semver"."4" =
     self.by-version."semver"."4.3.0";
-  by-spec."semver".">=2.0.10 <3.0.0" =
-    self.by-version."semver"."2.3.2";
   by-spec."semver".">=2.2.1 <3" =
     self.by-version."semver"."2.3.2";
   by-spec."semver"."^2.2.1" =
@@ -25620,24 +33841,11 @@
     self.by-version."semver"."1.1.4";
   by-spec."semver"."~2.0.5" =
     self.by-version."semver"."2.0.11";
-  by-spec."semver"."~2.1.0" =
-    self.by-version."semver"."2.1.0";
-  by-version."semver"."2.1.0" = self.buildNodePackage {
-    name = "semver-2.1.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
-      name = "semver-2.1.0.tgz";
-      sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
-    };
-    deps = {
-    };
-    peerDependencies = [];
-  };
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
   by-version."semver"."2.2.1" = self.buildNodePackage {
     name = "semver-2.2.1";
+    version = "2.2.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
@@ -25646,14 +33854,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."~2.3.0" =
     self.by-version."semver"."2.3.2";
+  by-spec."semver"."~3.0.1" =
+    self.by-version."semver"."3.0.1";
   by-spec."semver"."~4.1.0" =
     self.by-version."semver"."4.1.1";
   by-version."semver"."4.1.1" = self.buildNodePackage {
     name = "semver-4.1.1";
+    version = "4.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz";
@@ -25662,7 +33877,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver"."~4.3.0" =
     self.by-version."semver"."4.3.0";
@@ -25670,6 +33889,7 @@
     self.by-version."semver-diff"."0.1.0";
   by-version."semver-diff"."0.1.0" = self.buildNodePackage {
     name = "semver-diff-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz";
@@ -25679,12 +33899,17 @@
     deps = {
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."semver-diff"."^2.0.0" =
     self.by-version."semver-diff"."2.0.0";
   by-version."semver-diff"."2.0.0" = self.buildNodePackage {
     name = "semver-diff-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz";
@@ -25694,12 +33919,17 @@
     deps = {
       "semver-4.3.0" = self.by-version."semver"."4.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."*" =
     self.by-version."send"."0.12.1";
   by-version."send"."0.12.1" = self.buildNodePackage {
     name = "send-0.12.1";
+    version = "0.12.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.12.1.tgz";
@@ -25718,12 +33948,17 @@
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.0.3" =
     self.by-version."send"."0.0.3";
   by-version."send"."0.0.3" = self.buildNodePackage {
     name = "send-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
@@ -25736,12 +33971,17 @@
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.1.0" =
     self.by-version."send"."0.1.0";
   by-version."send"."0.1.0" = self.buildNodePackage {
     name = "send-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
@@ -25754,12 +33994,17 @@
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.1.4" =
     self.by-version."send"."0.1.4";
   by-version."send"."0.1.4" = self.buildNodePackage {
     name = "send-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
@@ -25772,12 +34017,17 @@
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.10.1" =
     self.by-version."send"."0.10.1";
   by-version."send"."0.10.1" = self.buildNodePackage {
     name = "send-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz";
@@ -25796,31 +34046,11 @@
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
-    peerDependencies = [];
-  };
-  by-spec."send"."0.11.1" =
-    self.by-version."send"."0.11.1";
-  by-version."send"."0.11.1" = self.buildNodePackage {
-    name = "send-0.11.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz";
-      name = "send-0.11.1.tgz";
-      sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
-    };
-    deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.12.1" =
     self.by-version."send"."0.12.1";
@@ -25828,6 +34058,7 @@
     self.by-version."send"."0.3.0";
   by-version."send"."0.3.0" = self.buildNodePackage {
     name = "send-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz";
@@ -25841,12 +34072,17 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.6.0" =
     self.by-version."send"."0.6.0";
   by-version."send"."0.6.0" = self.buildNodePackage {
     name = "send-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz";
@@ -25863,12 +34099,46 @@
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."send"."0.9.2" =
+    self.by-version."send"."0.9.2";
+  by-version."send"."0.9.2" = self.buildNodePackage {
+    name = "send-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.9.2.tgz";
+      name = "send-0.9.2.tgz";
+      sha1 = "77d22a0f462604451917075c6f52e69c2b3b6e25";
+    };
+    deps = {
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "depd-0.4.5" = self.by-version."depd"."0.4.5";
+      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.3.1" = self.by-version."etag"."1.3.1";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+      "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."0.9.3" =
     self.by-version."send"."0.9.3";
   by-version."send"."0.9.3" = self.buildNodePackage {
     name = "send-0.9.3";
+    version = "0.9.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz";
@@ -25887,14 +34157,40 @@
       "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."send"."^0.9.2" =
     self.by-version."send"."0.9.3";
+  by-spec."sentiment"."0.2.3" =
+    self.by-version."sentiment"."0.2.3";
+  by-version."sentiment"."0.2.3" = self.buildNodePackage {
+    name = "sentiment-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sentiment/-/sentiment-0.2.3.tgz";
+      name = "sentiment-0.2.3.tgz";
+      sha1 = "aa3e8581268b5c384746aa3ac7218f302cff3b2a";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = self.buildNodePackage {
     name = "sequence-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
@@ -25903,12 +34199,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sequencify"."~0.0.7" =
     self.by-version."sequencify"."0.0.7";
   by-version."sequencify"."0.0.7" = self.buildNodePackage {
     name = "sequencify-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
@@ -25917,12 +34218,42 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."serialport"."1.4.10" =
+    self.by-version."serialport"."1.4.10";
+  by-version."serialport"."1.4.10" = self.buildNodePackage {
+    name = "serialport-1.4.10";
+    version = "1.4.10";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serialport/-/serialport-1.4.10.tgz";
+      name = "serialport-1.4.10.tgz";
+      sha1 = "dcefd2cea7a351685716b8ccb43b93822480fb93";
+    };
+    deps = {
+      "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "sf-0.1.7" = self.by-version."sf"."0.1.7";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."serve-favicon"."^2.1.1" =
     self.by-version."serve-favicon"."2.2.0";
   by-version."serve-favicon"."2.2.0" = self.buildNodePackage {
     name = "serve-favicon-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz";
@@ -25935,12 +34266,17 @@
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."serve-favicon"."~2.1.5" =
+  by-spec."serve-favicon"."~2.1.4" =
     self.by-version."serve-favicon"."2.1.7";
   by-version."serve-favicon"."2.1.7" = self.buildNodePackage {
     name = "serve-favicon-2.1.7";
+    version = "2.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz";
@@ -25952,14 +34288,21 @@
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."serve-favicon"."~2.1.5" =
+    self.by-version."serve-favicon"."2.1.7";
   by-spec."serve-favicon"."~2.2.0" =
     self.by-version."serve-favicon"."2.2.0";
   by-spec."serve-index"."1.0.1" =
     self.by-version."serve-index"."1.0.1";
   by-version."serve-index"."1.0.1" = self.buildNodePackage {
     name = "serve-index-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
@@ -25970,12 +34313,17 @@
       "batch-0.5.0" = self.by-version."batch"."0.5.0";
       "negotiator-0.4.2" = self.by-version."negotiator"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."serve-index"."~1.2.1" =
     self.by-version."serve-index"."1.2.1";
   by-version."serve-index"."1.2.1" = self.buildNodePackage {
     name = "serve-index-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz";
@@ -25988,12 +34336,17 @@
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."serve-index"."~1.6.1" =
+  by-spec."serve-index"."~1.6.2" =
     self.by-version."serve-index"."1.6.2";
   by-version."serve-index"."1.6.2" = self.buildNodePackage {
     name = "serve-index-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.2.tgz";
@@ -26008,14 +34361,17 @@
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."serve-index"."~1.6.2" =
-    self.by-version."serve-index"."1.6.2";
   by-spec."serve-static"."1.1.0" =
     self.by-version."serve-static"."1.1.0";
   by-version."serve-static"."1.1.0" = self.buildNodePackage {
     name = "serve-static-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
@@ -26026,12 +34382,17 @@
       "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1";
       "send-0.3.0" = self.by-version."send"."0.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."serve-static"."~1.3.2" =
     self.by-version."serve-static"."1.3.2";
   by-version."serve-static"."1.3.2" = self.buildNodePackage {
     name = "serve-static-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
@@ -26043,12 +34404,17 @@
       "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
       "send-0.6.0" = self.by-version."send"."0.6.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."serve-static"."~1.6.4" =
+  by-spec."serve-static"."~1.6.2" =
     self.by-version."serve-static"."1.6.5";
   by-version."serve-static"."1.6.5" = self.buildNodePackage {
     name = "serve-static-1.6.5";
+    version = "1.6.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz";
@@ -26061,12 +34427,19 @@
       "send-0.9.3" = self.by-version."send"."0.9.3";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."serve-static"."~1.6.4" =
+    self.by-version."serve-static"."1.6.5";
   by-spec."serve-static"."~1.7.1" =
     self.by-version."serve-static"."1.7.2";
   by-version."serve-static"."1.7.2" = self.buildNodePackage {
     name = "serve-static-1.7.2";
+    version = "1.7.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.2.tgz";
@@ -26079,32 +34452,19 @@
       "send-0.10.1" = self.by-version."send"."0.10.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."serve-static"."~1.7.2" =
     self.by-version."serve-static"."1.7.2";
-  by-spec."serve-static"."~1.8.1" =
-    self.by-version."serve-static"."1.8.1";
-  by-version."serve-static"."1.8.1" = self.buildNodePackage {
-    name = "serve-static-1.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
-      name = "serve-static-1.8.1.tgz";
-      sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c";
-    };
-    deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.11.1" = self.by-version."send"."0.11.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    peerDependencies = [];
-  };
   by-spec."serve-static"."~1.9.1" =
     self.by-version."serve-static"."1.9.1";
   by-version."serve-static"."1.9.1" = self.buildNodePackage {
     name = "serve-static-1.9.1";
+    version = "1.9.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.1.tgz";
@@ -26117,12 +34477,17 @@
       "send-0.12.1" = self.by-version."send"."0.12.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."set-immediate-shim"."^1.0.0" =
     self.by-version."set-immediate-shim"."1.0.0";
   by-version."set-immediate-shim"."1.0.0" = self.buildNodePackage {
     name = "set-immediate-shim-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.0.tgz";
@@ -26131,12 +34496,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."setimmediate"."1.0.1" =
     self.by-version."setimmediate"."1.0.1";
   by-version."setimmediate"."1.0.1" = self.buildNodePackage {
     name = "setimmediate-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
@@ -26145,12 +34515,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sf"."0.1.7" =
+    self.by-version."sf"."0.1.7";
+  by-version."sf"."0.1.7" = self.buildNodePackage {
+    name = "sf-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sf/-/sf-0.1.7.tgz";
+      name = "sf-0.1.7.tgz";
+      sha1 = "806ed032d7225c7fb6394b0bdbfe1ea936fe6d74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.4";
   by-version."sha"."1.2.4" = self.buildNodePackage {
     name = "sha-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
@@ -26158,15 +34552,20 @@
       sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
     };
     deps = {
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sha"."~1.3.0" =
     self.by-version."sha"."1.3.0";
   by-version."sha"."1.3.0" = self.buildNodePackage {
     name = "sha-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz";
@@ -26174,15 +34573,39 @@
       sha1 = "79f4787045d0ede7327d702c25c443460dbc6764";
     };
     deps = {
+    };
+    optionalDependencies = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sha.js"."2.2.6" =
+    self.by-version."sha.js"."2.2.6";
+  by-version."sha.js"."2.2.6" = self.buildNodePackage {
+    name = "sha.js-2.2.6";
+    version = "2.2.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
+      name = "sha.js-2.2.6.tgz";
+      sha1 = "17ddeddc5f722fb66501658895461977867315ba";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sha.js"."^2.3.6" =
     self.by-version."sha.js"."2.3.6";
   by-version."sha.js"."2.3.6" = self.buildNodePackage {
     name = "sha.js-2.3.6";
+    version = "2.3.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz";
@@ -26192,7 +34615,11 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sha.js"."~2.3.0" =
     self.by-version."sha.js"."2.3.6";
@@ -26200,6 +34627,7 @@
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = self.buildNodePackage {
     name = "shallow-copy-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
@@ -26208,12 +34636,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."shasum"."^1.0.0" =
     self.by-version."shasum"."1.0.1";
   by-version."shasum"."1.0.1" = self.buildNodePackage {
     name = "shasum-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz";
@@ -26224,12 +34657,17 @@
       "json-stable-stringify-0.0.1" = self.by-version."json-stable-stringify"."0.0.1";
       "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."shell-quote"."~0.0.1" =
     self.by-version."shell-quote"."0.0.1";
   by-version."shell-quote"."0.0.1" = self.buildNodePackage {
     name = "shell-quote-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
@@ -26238,12 +34676,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."shell-quote"."~1.4.1" =
     self.by-version."shell-quote"."1.4.2";
   by-version."shell-quote"."1.4.2" = self.buildNodePackage {
     name = "shell-quote-1.4.2";
+    version = "1.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz";
@@ -26256,12 +34699,17 @@
       "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0";
       "array-map-0.0.0" = self.by-version."array-map"."0.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."shelljs"."*" =
     self.by-version."shelljs"."0.3.0";
   by-version."shelljs"."0.3.0" = self.buildNodePackage {
     name = "shelljs-0.3.0";
+    version = "0.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
@@ -26270,7 +34718,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "shelljs" = self.by-version."shelljs"."0.3.0";
   by-spec."shelljs"."0.3.0" =
@@ -26278,27 +34730,33 @@
   by-spec."shelljs"."0.3.x" =
     self.by-version."shelljs"."0.3.0";
   by-spec."should"."*" =
-    self.by-version."should"."5.0.0";
-  by-version."should"."5.0.0" = self.buildNodePackage {
-    name = "should-5.0.0";
+    self.by-version."should"."5.0.1";
+  by-version."should"."5.0.1" = self.buildNodePackage {
+    name = "should-5.0.1";
+    version = "5.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should/-/should-5.0.0.tgz";
-      name = "should-5.0.0.tgz";
-      sha1 = "ec3f8fae8703e5b422f4bd7f1273934e110d448c";
+      url = "http://registry.npmjs.org/should/-/should-5.0.1.tgz";
+      name = "should-5.0.1.tgz";
+      sha1 = "f0c593ce78158ace3a41a92cb0cc5cf7772d7fa0";
     };
     deps = {
       "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1";
       "should-format-0.0.7" = self.by-version."should-format"."0.0.7";
       "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "should" = self.by-version."should"."5.0.0";
+  "should" = self.by-version."should"."5.0.1";
   by-spec."should-equal"."0.3.1" =
     self.by-version."should-equal"."0.3.1";
   by-version."should-equal"."0.3.1" = self.buildNodePackage {
     name = "should-equal-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/should-equal/-/should-equal-0.3.1.tgz";
@@ -26308,12 +34766,17 @@
     deps = {
       "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."should-format"."0.0.7" =
     self.by-version."should-format"."0.0.7";
   by-version."should-format"."0.0.7" = self.buildNodePackage {
     name = "should-format-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/should-format/-/should-format-0.0.7.tgz";
@@ -26323,12 +34786,17 @@
     deps = {
       "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."should-type"."0.0.4" =
     self.by-version."should-type"."0.0.4";
   by-version."should-type"."0.0.4" = self.buildNodePackage {
     name = "should-type-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/should-type/-/should-type-0.0.4.tgz";
@@ -26337,12 +34805,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = self.buildNodePackage {
     name = "sigmund-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
@@ -26351,12 +34824,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."signals"."<2.0" =
     self.by-version."signals"."1.0.0";
   by-version."signals"."1.0.0" = self.buildNodePackage {
     name = "signals-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
@@ -26365,7 +34843,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."signals".">0.7 <2.0" =
     self.by-version."signals"."1.0.0";
@@ -26375,6 +34857,7 @@
     self.by-version."simple-fmt"."0.1.0";
   by-version."simple-fmt"."0.1.0" = self.buildNodePackage {
     name = "simple-fmt-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz";
@@ -26383,12 +34866,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simple-get"."^1.3.0" =
     self.by-version."simple-get"."1.3.0";
   by-version."simple-get"."1.3.0" = self.buildNodePackage {
     name = "simple-get-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.0.tgz";
@@ -26398,12 +34886,17 @@
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simple-is"."~0.2.0" =
     self.by-version."simple-is"."0.2.0";
   by-version."simple-is"."0.2.0" = self.buildNodePackage {
     name = "simple-is-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz";
@@ -26412,12 +34905,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simple-lru-cache"."0.0.x" =
     self.by-version."simple-lru-cache"."0.0.1";
   by-version."simple-lru-cache"."0.0.1" = self.buildNodePackage {
     name = "simple-lru-cache-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
@@ -26426,12 +34924,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simplediff"."~0.1.1" =
     self.by-version."simplediff"."0.1.1";
   by-version."simplediff"."0.1.1" = self.buildNodePackage {
     name = "simplediff-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
@@ -26440,12 +34943,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
     self.by-version."simplesmtp"."0.3.35";
   by-version."simplesmtp"."0.3.35" = self.buildNodePackage {
     name = "simplesmtp-0.3.35";
+    version = "0.3.35";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz";
@@ -26456,7 +34964,11 @@
       "rai-0.1.12" = self.by-version."rai"."0.1.12";
       "xoauth2-0.1.8" = self.by-version."xoauth2"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."simplesmtp"."~0.2 || ~0.3.30" =
     self.by-version."simplesmtp"."0.3.35";
@@ -26466,6 +34978,7 @@
     self.by-version."single-line-log"."0.4.1";
   by-version."single-line-log"."0.4.1" = self.buildNodePackage {
     name = "single-line-log-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz";
@@ -26474,12 +34987,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sinon"."*" =
     self.by-version."sinon"."1.12.2";
   by-version."sinon"."1.12.2" = self.buildNodePackage {
     name = "sinon-1.12.2";
+    version = "1.12.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz";
@@ -26491,13 +35009,18 @@
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "lolex-1.1.0" = self.by-version."lolex"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "sinon" = self.by-version."sinon"."1.12.2";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.4";
   by-version."slasp"."0.0.4" = self.buildNodePackage {
     name = "slasp-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
@@ -26506,15 +35029,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "slasp" = self.by-version."slasp"."0.0.4";
   by-spec."slasp"."0.0.4" =
     self.by-version."slasp"."0.0.4";
+  by-spec."sleep"."*" =
+    self.by-version."sleep"."2.0.0";
+  by-version."sleep"."2.0.0" = self.buildNodePackage {
+    name = "sleep-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sleep/-/sleep-2.0.0.tgz";
+      name = "sleep-2.0.0.tgz";
+      sha1 = "96d8ef97970ecad464b146ea5e86dd5d6ceb65bc";
+    };
+    deps = {
+      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sleep" = self.by-version."sleep"."2.0.0";
   by-spec."sleep"."^1.2.0" =
     self.by-version."sleep"."1.2.0";
   by-version."sleep"."1.2.0" = self.buildNodePackage {
     name = "sleep-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sleep/-/sleep-1.2.0.tgz";
@@ -26524,12 +35073,17 @@
     deps = {
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sliced"."0.0.3" =
     self.by-version."sliced"."0.0.3";
   by-version."sliced"."0.0.3" = self.buildNodePackage {
     name = "sliced-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
@@ -26538,12 +35092,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sliced"."0.0.4" =
     self.by-version."sliced"."0.0.4";
   by-version."sliced"."0.0.4" = self.buildNodePackage {
     name = "sliced-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
@@ -26552,12 +35111,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sliced"."0.0.5" =
     self.by-version."sliced"."0.0.5";
   by-version."sliced"."0.0.5" = self.buildNodePackage {
     name = "sliced-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
@@ -26566,12 +35130,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."slide"."*" =
     self.by-version."slide"."1.1.6";
   by-version."slide"."1.1.6" = self.buildNodePackage {
     name = "slide-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
@@ -26580,7 +35149,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."slide"."^1.1.3" =
     self.by-version."slide"."1.1.6";
@@ -26594,6 +35167,7 @@
     self.by-version."sloc"."0.1.9";
   by-version."sloc"."0.1.9" = self.buildNodePackage {
     name = "sloc-0.1.9";
+    version = "0.1.9";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz";
@@ -26606,13 +35180,18 @@
       "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1";
       "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "sloc" = self.by-version."sloc"."0.1.9";
   by-spec."smartdc"."*" =
     self.by-version."smartdc"."7.3.0";
   by-version."smartdc"."7.3.0" = self.buildNodePackage {
     name = "smartdc-7.3.0";
+    version = "7.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
@@ -26631,13 +35210,18 @@
       "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0";
       "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "smartdc" = self.by-version."smartdc"."7.3.0";
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
   by-version."smartdc-auth"."1.0.1" = self.buildNodePackage {
     name = "smartdc-auth-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
@@ -26651,12 +35235,38 @@
       "once-1.1.1" = self.by-version."once"."1.1.1";
       "vasync-1.3.3" = self.by-version."vasync"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."smtp-connection"."^1.0.0" =
+    self.by-version."smtp-connection"."1.1.0";
+  by-version."smtp-connection"."1.1.0" = self.buildNodePackage {
+    name = "smtp-connection-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/smtp-connection/-/smtp-connection-1.1.0.tgz";
+      name = "smtp-connection-1.1.0.tgz";
+      sha1 = "38688174a97bade7040500bf9cd5cf831f4b40f8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."smtp-connection"."^1.1.0" =
+    self.by-version."smtp-connection"."1.1.0";
   by-spec."sntp"."0.1.x" =
     self.by-version."sntp"."0.1.4";
   by-version."sntp"."0.1.4" = self.buildNodePackage {
     name = "sntp-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
@@ -26666,12 +35276,17 @@
     deps = {
       "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sntp"."0.2.x" =
     self.by-version."sntp"."0.2.4";
   by-version."sntp"."0.2.4" = self.buildNodePackage {
     name = "sntp-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
@@ -26681,12 +35296,17 @@
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sntp"."1.x.x" =
     self.by-version."sntp"."1.0.9";
   by-version."sntp"."1.0.9" = self.buildNodePackage {
     name = "sntp-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
@@ -26696,12 +35316,17 @@
     deps = {
       "hoek-2.11.0" = self.by-version."hoek"."2.11.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io"."0.9.14" =
     self.by-version."socket.io"."0.9.14";
   by-version."socket.io"."0.9.14" = self.buildNodePackage {
     name = "socket.io-0.9.14";
+    version = "0.9.14";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
@@ -26712,14 +35337,19 @@
       "socket.io-client-0.9.11" = self.by-version."socket.io-client"."0.9.11";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+    };
+    optionalDependencies = {
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io"."0.9.16" =
     self.by-version."socket.io"."0.9.16";
   by-version."socket.io"."0.9.16" = self.buildNodePackage {
     name = "socket.io-0.9.16";
+    version = "0.9.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
@@ -26730,14 +35360,19 @@
       "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+    };
+    optionalDependencies = {
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io"."1.0.6" =
     self.by-version."socket.io"."1.0.6";
   by-version."socket.io"."1.0.6" = self.buildNodePackage {
     name = "socket.io-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
@@ -26752,12 +35387,17 @@
       "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io"."~0.9.16" =
     self.by-version."socket.io"."0.9.17";
   by-version."socket.io"."0.9.17" = self.buildNodePackage {
     name = "socket.io-0.9.17";
+    version = "0.9.17";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
@@ -26768,9 +35408,13 @@
       "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+    };
+    optionalDependencies = {
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io"."~0.9.17" =
     self.by-version."socket.io"."0.9.17";
@@ -26778,6 +35422,7 @@
     self.by-version."socket.io-adapter"."0.2.0";
   by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage {
     name = "socket.io-adapter-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz";
@@ -26788,12 +35433,17 @@
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "socket.io-parser-2.1.2" = self.by-version."socket.io-parser"."2.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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" = self.buildNodePackage {
     name = "socket.io-client-0.9.11";
+    version = "0.9.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
@@ -26806,12 +35456,17 @@
       "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
       "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io-client"."0.9.16" =
     self.by-version."socket.io-client"."0.9.16";
   by-version."socket.io-client"."0.9.16" = self.buildNodePackage {
     name = "socket.io-client-0.9.16";
+    version = "0.9.16";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
@@ -26824,12 +35479,17 @@
       "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
       "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io-client"."1.0.6" =
     self.by-version."socket.io-client"."1.0.6";
   by-version."socket.io-client"."1.0.6" = self.buildNodePackage {
     name = "socket.io-client-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
@@ -26848,12 +35508,17 @@
       "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2";
       "to-array-0.1.3" = self.by-version."to-array"."0.1.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io-parser"."2.1.2" =
     self.by-version."socket.io-parser"."2.1.2";
   by-version."socket.io-parser"."2.1.2" = self.buildNodePackage {
     name = "socket.io-parser-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz";
@@ -26866,12 +35531,17 @@
       "emitter-1.0.1" = self.by-version."emitter"."1.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socket.io-parser"."2.2.0" =
     self.by-version."socket.io-parser"."2.2.0";
   by-version."socket.io-parser"."2.2.0" = self.buildNodePackage {
     name = "socket.io-parser-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz";
@@ -26884,12 +35554,17 @@
       "emitter-1.0.1" = self.by-version."emitter"."1.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sockjs"."*" =
     self.by-version."sockjs"."0.3.12";
   by-version."sockjs"."0.3.12" = self.buildNodePackage {
     name = "sockjs-0.3.12";
+    version = "0.3.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.12.tgz";
@@ -26897,16 +35572,21 @@
       sha1 = "99f5686851cf8655706da977f56ccd266dded859";
     };
     deps = {
-      "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2";
+      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "sockjs" = self.by-version."sockjs"."0.3.12";
   by-spec."socks-proxy-agent"."0" =
     self.by-version."socks-proxy-agent"."0.1.2";
   by-version."socks-proxy-agent"."0.1.2" = self.buildNodePackage {
     name = "socks-proxy-agent-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-0.1.2.tgz";
@@ -26918,12 +35598,17 @@
       "rainbowsocks-0.1.2" = self.by-version."rainbowsocks"."0.1.2";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sorted-object"."~1.0.0" =
     self.by-version."sorted-object"."1.0.0";
   by-version."sorted-object"."1.0.0" = self.buildNodePackage {
     name = "sorted-object-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
@@ -26932,12 +35617,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."source-map"."*" =
     self.by-version."source-map"."0.3.0";
   by-version."source-map"."0.3.0" = self.buildNodePackage {
     name = "source-map-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
@@ -26947,13 +35637,18 @@
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "source-map" = self.by-version."source-map"."0.3.0";
   by-spec."source-map"."0.1.31" =
     self.by-version."source-map"."0.1.31";
   by-version."source-map"."0.1.31" = self.buildNodePackage {
     name = "source-map-0.1.31";
+    version = "0.1.31";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
@@ -26963,27 +35658,17 @@
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
-    peerDependencies = [];
-  };
-  by-spec."source-map"."0.1.32" =
-    self.by-version."source-map"."0.1.32";
-  by-version."source-map"."0.1.32" = self.buildNodePackage {
-    name = "source-map-0.1.32";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
-      name = "source-map-0.1.32.tgz";
-      sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
-    };
-    deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."source-map"."0.1.34" =
     self.by-version."source-map"."0.1.34";
   by-version."source-map"."0.1.34" = self.buildNodePackage {
     name = "source-map-0.1.34";
+    version = "0.1.34";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
@@ -26993,12 +35678,17 @@
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."source-map"."0.1.x" =
     self.by-version."source-map"."0.1.43";
   by-version."source-map"."0.1.43" = self.buildNodePackage {
     name = "source-map-0.1.43";
+    version = "0.1.43";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
@@ -27008,7 +35698,11 @@
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."source-map".">= 0.1.2" =
     self.by-version."source-map"."0.3.0";
@@ -27018,6 +35712,7 @@
     self.by-version."source-map"."0.2.0";
   by-version."source-map"."0.2.0" = self.buildNodePackage {
     name = "source-map-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz";
@@ -27027,20 +35722,29 @@
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."source-map"."~0.1.31" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.33" =
     self.by-version."source-map"."0.1.43";
+  by-spec."source-map"."~0.1.38" =
+    self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.40" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.7" =
     self.by-version."source-map"."0.1.43";
+  by-spec."source-map"."~0.3.0" =
+    self.by-version."source-map"."0.3.0";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = self.buildNodePackage {
     name = "spdy-1.7.1";
+    version = "1.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
@@ -27049,12 +35753,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."speedometer"."^0.1.2" =
     self.by-version."speedometer"."0.1.4";
   by-version."speedometer"."0.1.4" = self.buildNodePackage {
     name = "speedometer-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz";
@@ -27063,12 +35772,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sprintf"."0.1.1" =
     self.by-version."sprintf"."0.1.1";
   by-version."sprintf"."0.1.1" = self.buildNodePackage {
     name = "sprintf-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";
@@ -27077,12 +35791,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sprintf".">=0.1.1" =
     self.by-version."sprintf"."0.1.5";
   by-version."sprintf"."0.1.5" = self.buildNodePackage {
     name = "sprintf-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
@@ -27091,18 +35810,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."sprintf"."~0.1.2" =
-    self.by-version."sprintf"."0.1.5";
   by-spec."sprintf"."~0.1.3" =
     self.by-version."sprintf"."0.1.5";
   by-spec."sprintf"."~0.1.4" =
     self.by-version."sprintf"."0.1.5";
+  by-spec."sprintf-js"."~1.0.2" =
+    self.by-version."sprintf-js"."1.0.2";
+  by-version."sprintf-js"."1.0.2" = self.buildNodePackage {
+    name = "sprintf-js-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
+      name = "sprintf-js-1.0.2.tgz";
+      sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."srt2vtt"."^1.2.0" =
     self.by-version."srt2vtt"."1.2.0";
   by-version."srt2vtt"."1.2.0" = self.buildNodePackage {
     name = "srt2vtt-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/srt2vtt/-/srt2vtt-1.2.0.tgz";
@@ -27113,12 +35854,17 @@
       "codepage-1.3.8" = self.by-version."codepage"."1.3.8";
       "utfx-1.0.0" = self.by-version."utfx"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ssh-agent"."0.2.1" =
     self.by-version."ssh-agent"."0.2.1";
   by-version."ssh-agent"."0.2.1" = self.buildNodePackage {
     name = "ssh-agent-0.2.1";
+    version = "0.2.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
@@ -27129,28 +35875,38 @@
       "ctype-0.5.0" = self.by-version."ctype"."0.5.0";
       "posix-getopt-1.0.0" = self.by-version."posix-getopt"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ssl-root-cas"."^1.1.7" =
-    self.by-version."ssl-root-cas"."1.1.9-beta";
-  by-version."ssl-root-cas"."1.1.9-beta" = self.buildNodePackage {
-    name = "ssl-root-cas-1.1.9-beta";
+    self.by-version."ssl-root-cas"."1.1.7";
+  by-version."ssl-root-cas"."1.1.7" = self.buildNodePackage {
+    name = "ssl-root-cas-1.1.7";
+    version = "1.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.9-beta.tgz";
-      name = "ssl-root-cas-1.1.9-beta.tgz";
-      sha1 = "0a090a4b908e88ef6d1a429dcf08720732eb2d58";
+      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.7.tgz";
+      name = "ssl-root-cas-1.1.7.tgz";
+      sha1 = "bb40ea00cf92dd5d80b3f92979348f7b56b2b5a4";
     };
     deps = {
-      "es6-promise-2.0.1" = self.by-version."es6-promise"."2.0.1";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "es6-promise-1.0.0" = self.by-version."es6-promise"."1.0.0";
+      "request-2.34.0" = self.by-version."request"."2.34.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stable"."~0.1.3" =
     self.by-version."stable"."0.1.5";
   by-version."stable"."0.1.5" = self.buildNodePackage {
     name = "stable-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stable/-/stable-0.1.5.tgz";
@@ -27159,12 +35915,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stack-trace"."0.0.7" =
     self.by-version."stack-trace"."0.0.7";
   by-version."stack-trace"."0.0.7" = self.buildNodePackage {
     name = "stack-trace-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
@@ -27173,12 +35934,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
   by-version."stack-trace"."0.0.9" = self.buildNodePackage {
     name = "stack-trace-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
@@ -27187,12 +35953,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
     self.by-version."stackdriver-statsd-backend"."0.2.3";
   by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
     name = "stackdriver-statsd-backend-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
@@ -27201,13 +35972,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
   by-spec."static-favicon"."1.0.2" =
     self.by-version."static-favicon"."1.0.2";
   by-version."static-favicon"."1.0.2" = self.buildNodePackage {
     name = "static-favicon-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
@@ -27216,12 +35992,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.2";
   by-version."statsd"."0.7.2" = self.buildNodePackage {
     name = "statsd-0.7.2";
+    version = "0.7.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
@@ -27229,32 +36010,42 @@
       sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
     };
     deps = {
+    };
+    optionalDependencies = {
       "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
       "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
       "winser-0.1.6" = self.by-version."winser"."0.1.6";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "statsd" = self.by-version."statsd"."0.7.2";
   by-spec."statsd-influxdb-backend"."*" =
-    self.by-version."statsd-influxdb-backend"."0.3.0";
-  by-version."statsd-influxdb-backend"."0.3.0" = self.buildNodePackage {
-    name = "statsd-influxdb-backend-0.3.0";
+    self.by-version."statsd-influxdb-backend"."0.4.0";
+  by-version."statsd-influxdb-backend"."0.4.0" = self.buildNodePackage {
+    name = "statsd-influxdb-backend-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.3.0.tgz";
-      name = "statsd-influxdb-backend-0.3.0.tgz";
-      sha1 = "f66197570545c04743c8637af1fbbc914096ec44";
+      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.4.0.tgz";
+      name = "statsd-influxdb-backend-0.4.0.tgz";
+      sha1 = "8595b6ef21a5932508bb265f366efca6ebde54d5";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.3.0";
+  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.4.0";
   by-spec."statsd-librato-backend"."*" =
     self.by-version."statsd-librato-backend"."0.1.6";
   by-version."statsd-librato-backend"."0.1.6" = self.buildNodePackage {
     name = "statsd-librato-backend-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.6.tgz";
@@ -27263,13 +36054,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.6";
   by-spec."statuses"."1" =
     self.by-version."statuses"."1.2.1";
   by-version."statuses"."1.2.1" = self.buildNodePackage {
     name = "statuses-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
@@ -27278,7 +36074,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."statuses"."^1.2.1" =
     self.by-version."statuses"."1.2.1";
@@ -27286,6 +36086,7 @@
     self.by-version."stream-browserify"."1.0.0";
   by-version."stream-browserify"."1.0.0" = self.buildNodePackage {
     name = "stream-browserify-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
@@ -27296,12 +36097,17 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-browserify"."~0.1.0" =
     self.by-version."stream-browserify"."0.1.3";
   by-version."stream-browserify"."0.1.3" = self.buildNodePackage {
     name = "stream-browserify-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
@@ -27312,12 +36118,17 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "process-0.5.2" = self.by-version."process"."0.5.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
     name = "stream-combiner-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
@@ -27327,12 +36138,17 @@
     deps = {
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-combiner2"."~1.0.0" =
     self.by-version."stream-combiner2"."1.0.2";
   by-version."stream-combiner2"."1.0.2" = self.buildNodePackage {
     name = "stream-combiner2-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
@@ -27343,12 +36159,17 @@
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-consume"."~0.1.0" =
     self.by-version."stream-consume"."0.1.0";
   by-version."stream-consume"."0.1.0" = self.buildNodePackage {
     name = "stream-consume-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
@@ -27357,12 +36178,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-counter"."^1.0.0" =
     self.by-version."stream-counter"."1.0.0";
   by-version."stream-counter"."1.0.0" = self.buildNodePackage {
     name = "stream-counter-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
@@ -27371,12 +36197,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-counter"."~0.2.0" =
     self.by-version."stream-counter"."0.2.0";
   by-version."stream-counter"."0.2.0" = self.buildNodePackage {
     name = "stream-counter-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
@@ -27386,12 +36217,17 @@
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-splicer"."^1.1.0" =
     self.by-version."stream-splicer"."1.3.1";
   by-version."stream-splicer"."1.3.1" = self.buildNodePackage {
     name = "stream-splicer-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz";
@@ -27406,28 +36242,17 @@
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
     };
-    peerDependencies = [];
-  };
-  by-spec."stream-splitter-transform"."*" =
-    self.by-version."stream-splitter-transform"."0.0.4";
-  by-version."stream-splitter-transform"."0.0.4" = self.buildNodePackage {
-    name = "stream-splitter-transform-0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
-      name = "stream-splitter-transform-0.0.4.tgz";
-      sha1 = "0de54e94680633a8d703b252b20fa809ed99331c";
-    };
-    deps = {
-      "buffertools-1.1.1" = self.by-version."buffertools"."1.1.1";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4";
   by-spec."stream-to-array"."~1.0.0" =
     self.by-version."stream-to-array"."1.0.0";
   by-version."stream-to-array"."1.0.0" = self.buildNodePackage {
     name = "stream-to-array-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-to-array/-/stream-to-array-1.0.0.tgz";
@@ -27436,12 +36261,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stream-transcoder"."0.0.5" =
     self.by-version."stream-transcoder"."0.0.5";
   by-version."stream-transcoder"."0.0.5" = self.buildNodePackage {
     name = "stream-transcoder-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz";
@@ -27450,12 +36280,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."streamsearch"."0.1.2" =
     self.by-version."streamsearch"."0.1.2";
   by-version."streamsearch"."0.1.2" = self.buildNodePackage {
     name = "streamsearch-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
@@ -27464,12 +36299,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string"."1.6.1" =
     self.by-version."string"."1.6.1";
   by-version."string"."1.6.1" = self.buildNodePackage {
     name = "string-1.6.1";
+    version = "1.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
@@ -27478,12 +36318,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string-length"."^0.1.2" =
     self.by-version."string-length"."0.1.2";
   by-version."string-length"."0.1.2" = self.buildNodePackage {
     name = "string-length-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
@@ -27493,12 +36338,17 @@
     deps = {
       "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string-length"."^1.0.0" =
     self.by-version."string-length"."1.0.0";
   by-version."string-length"."1.0.0" = self.buildNodePackage {
     name = "string-length-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz";
@@ -27508,12 +36358,17 @@
     deps = {
       "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string-template"."~0.2.0" =
     self.by-version."string-template"."0.2.0";
   by-version."string-template"."0.2.0" = self.buildNodePackage {
     name = "string-template-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string-template/-/string-template-0.2.0.tgz";
@@ -27523,12 +36378,17 @@
     deps = {
       "js-string-escape-1.0.0" = self.by-version."js-string-escape"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string2compact"."^1.1.1" =
     self.by-version."string2compact"."1.2.1";
   by-version."string2compact"."1.2.1" = self.buildNodePackage {
     name = "string2compact-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz";
@@ -27539,12 +36399,17 @@
       "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0";
       "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string_decoder"."~0.0.0" =
     self.by-version."string_decoder"."0.0.1";
   by-version."string_decoder"."0.0.1" = self.buildNodePackage {
     name = "string_decoder-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
@@ -27553,12 +36418,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string_decoder"."~0.10.0" =
     self.by-version."string_decoder"."0.10.31";
   by-version."string_decoder"."0.10.31" = self.buildNodePackage {
     name = "string_decoder-0.10.31";
+    version = "0.10.31";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
@@ -27567,14 +36437,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."string_decoder"."~0.10.25" =
+    self.by-version."string_decoder"."0.10.31";
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.31";
   by-spec."stringify-object"."~1.0.0" =
     self.by-version."stringify-object"."1.0.0";
   by-version."stringify-object"."1.0.0" = self.buildNodePackage {
     name = "stringify-object-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz";
@@ -27583,12 +36460,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stringmap"."~0.2.2" =
     self.by-version."stringmap"."0.2.2";
   by-version."stringmap"."0.2.2" = self.buildNodePackage {
     name = "stringmap-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz";
@@ -27597,12 +36479,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stringset"."~0.2.1" =
     self.by-version."stringset"."0.2.1";
   by-version."stringset"."0.2.1" = self.buildNodePackage {
     name = "stringset-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz";
@@ -27611,12 +36498,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stringstream"."~0.0.4" =
     self.by-version."stringstream"."0.0.4";
   by-version."stringstream"."0.0.4" = self.buildNodePackage {
     name = "stringstream-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
@@ -27625,12 +36517,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-ansi"."^0.2.1" =
     self.by-version."strip-ansi"."0.2.2";
   by-version."strip-ansi"."0.2.2" = self.buildNodePackage {
     name = "strip-ansi-0.2.2";
+    version = "0.2.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
@@ -27640,12 +36537,17 @@
     deps = {
       "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-ansi"."^0.3.0" =
     self.by-version."strip-ansi"."0.3.0";
   by-version."strip-ansi"."0.3.0" = self.buildNodePackage {
     name = "strip-ansi-0.3.0";
+    version = "0.3.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
@@ -27655,12 +36557,17 @@
     deps = {
       "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-ansi"."^1.0.0" =
     self.by-version."strip-ansi"."1.0.0";
   by-version."strip-ansi"."1.0.0" = self.buildNodePackage {
     name = "strip-ansi-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz";
@@ -27670,12 +36577,17 @@
     deps = {
       "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-ansi"."^2.0.0" =
     self.by-version."strip-ansi"."2.0.1";
   by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
     name = "strip-ansi-2.0.1";
+    version = "2.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
@@ -27683,9 +36595,13 @@
       sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
     };
     deps = {
-      "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0";
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-ansi"."^2.0.1" =
     self.by-version."strip-ansi"."2.0.1";
@@ -27693,6 +36609,7 @@
     self.by-version."strip-bom"."1.0.0";
   by-version."strip-bom"."1.0.0" = self.buildNodePackage {
     name = "strip-bom-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
@@ -27703,12 +36620,17 @@
       "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0";
       "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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" = self.buildNodePackage {
     name = "strip-json-comments-0.1.3";
+    version = "0.1.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
@@ -27717,12 +36639,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strip-json-comments"."1.0.x" =
     self.by-version."strip-json-comments"."1.0.2";
   by-version."strip-json-comments"."1.0.2" = self.buildNodePackage {
     name = "strip-json-comments-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz";
@@ -27731,12 +36658,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."strong-data-uri"."~0.1.0" =
     self.by-version."strong-data-uri"."0.1.1";
   by-version."strong-data-uri"."0.1.1" = self.buildNodePackage {
     name = "strong-data-uri-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
@@ -27746,12 +36678,17 @@
     deps = {
       "truncate-1.0.4" = self.by-version."truncate"."1.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stylus"."*" =
     self.by-version."stylus"."0.50.0";
   by-version."stylus"."0.50.0" = self.buildNodePackage {
     name = "stylus-0.50.0";
+    version = "0.50.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/stylus/-/stylus-0.50.0.tgz";
@@ -27766,13 +36703,18 @@
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "stylus" = self.by-version."stylus"."0.50.0";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = self.buildNodePackage {
     name = "stylus-0.42.2";
+    version = "0.42.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
@@ -27786,12 +36728,17 @@
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stylus"."0.49.x" =
     self.by-version."stylus"."0.49.3";
   by-version."stylus"."0.49.3" = self.buildNodePackage {
     name = "stylus-0.49.3";
+    version = "0.49.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
@@ -27806,12 +36753,17 @@
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."subarg"."0.0.1" =
     self.by-version."subarg"."0.0.1";
   by-version."subarg"."0.0.1" = self.buildNodePackage {
     name = "subarg-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
@@ -27821,12 +36773,17 @@
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."subarg"."^1.0.0" =
     self.by-version."subarg"."1.0.0";
   by-version."subarg"."1.0.0" = self.buildNodePackage {
     name = "subarg-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
@@ -27836,12 +36793,17 @@
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sugar"."^1.4.1" =
     self.by-version."sugar"."1.4.1";
   by-version."sugar"."1.4.1" = self.buildNodePackage {
     name = "sugar-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sugar/-/sugar-1.4.1.tgz";
@@ -27850,12 +36812,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."superagent"."0.21.0" =
     self.by-version."superagent"."0.21.0";
   by-version."superagent"."0.21.0" = self.buildNodePackage {
     name = "superagent-0.21.0";
+    version = "0.21.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
@@ -27875,7 +36842,11 @@
       "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
       "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."superagent"."~0.21.0" =
     self.by-version."superagent"."0.21.0";
@@ -27883,6 +36854,7 @@
     self.by-version."supertest"."0.15.0";
   by-version."supertest"."0.15.0" = self.buildNodePackage {
     name = "supertest-0.15.0";
+    version = "0.15.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz";
@@ -27893,13 +36865,37 @@
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "supertest" = self.by-version."supertest"."0.15.0";
+  by-spec."supports-color"."1.2.x" =
+    self.by-version."supports-color"."1.2.1";
+  by-version."supports-color"."1.2.1" = self.buildNodePackage {
+    name = "supports-color-1.2.1";
+    version = "1.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz";
+      name = "supports-color-1.2.1.tgz";
+      sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."supports-color"."^0.2.0" =
     self.by-version."supports-color"."0.2.0";
   by-version."supports-color"."0.2.0" = self.buildNodePackage {
     name = "supports-color-0.2.0";
+    version = "0.2.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
@@ -27908,12 +36904,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = self.buildNodePackage {
     name = "swig-0.14.0";
+    version = "0.14.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
@@ -27921,15 +36922,20 @@
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "swig" = self.by-version."swig"."0.14.0";
   by-spec."sylvester".">= 0.0.12" =
     self.by-version."sylvester"."0.0.21";
   by-version."sylvester"."0.0.21" = self.buildNodePackage {
     name = "sylvester-0.0.21";
+    version = "0.0.21";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
@@ -27938,7 +36944,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
@@ -27946,6 +36956,7 @@
     self.by-version."syntax-error"."1.1.2";
   by-version."syntax-error"."1.1.2" = self.buildNodePackage {
     name = "syntax-error-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz";
@@ -27955,12 +36966,17 @@
     deps = {
       "acorn-0.9.0" = self.by-version."acorn"."0.9.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."syntax-error"."~0.0.0" =
     self.by-version."syntax-error"."0.0.1";
   by-version."syntax-error"."0.0.1" = self.buildNodePackage {
     name = "syntax-error-0.0.1";
+    version = "0.0.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz";
@@ -27970,12 +36986,17 @@
     deps = {
       "esprima-0.9.9" = self.by-version."esprima"."0.9.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."syntax-error"."~0.1.0" =
     self.by-version."syntax-error"."0.1.0";
   by-version."syntax-error"."0.1.0" = self.buildNodePackage {
     name = "syntax-error-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
@@ -27985,12 +37006,17 @@
     deps = {
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tabtab"."git+https://github.com/mixu/node-tabtab.git" =
     self.by-version."tabtab"."0.0.2";
   by-version."tabtab"."0.0.2" = self.buildNodePackage {
     name = "tabtab-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchgit {
       url = "https://github.com/mixu/node-tabtab.git";
@@ -27999,12 +37025,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tap"."~0.3.3" =
     self.by-version."tap"."0.3.3";
   by-version."tap"."0.3.3" = self.buildNodePackage {
     name = "tap-0.3.3";
+    version = "0.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
@@ -28022,12 +37053,38 @@
       "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."tapable"."^0.1.8" =
+    self.by-version."tapable"."0.1.8";
+  by-version."tapable"."0.1.8" = self.buildNodePackage {
+    name = "tapable-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tapable/-/tapable-0.1.8.tgz";
+      name = "tapable-0.1.8.tgz";
+      sha1 = "a943314bc86ac87602c93fbc8ac609dcb19c199e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tapable"."~0.1.8" =
+    self.by-version."tapable"."0.1.8";
   by-spec."tape"."~0.2.2" =
     self.by-version."tape"."0.2.2";
   by-version."tape"."0.2.2" = self.buildNodePackage {
     name = "tape-0.2.2";
+    version = "0.2.2";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
@@ -28039,12 +37096,17 @@
       "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar"."*" =
     self.by-version."tar"."1.0.3";
   by-version."tar"."1.0.3" = self.buildNodePackage {
     name = "tar-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
@@ -28056,13 +37118,18 @@
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "tar" = self.by-version."tar"."1.0.3";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = self.buildNodePackage {
     name = "tar-0.1.17";
+    version = "0.1.17";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
@@ -28074,12 +37141,17 @@
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar"."1.0.2" =
     self.by-version."tar"."1.0.2";
   by-version."tar"."1.0.2" = self.buildNodePackage {
     name = "tar-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz";
@@ -28091,7 +37163,11 @@
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar"."^1.0.0" =
     self.by-version."tar"."1.0.3";
@@ -28099,6 +37175,7 @@
     self.by-version."tar"."0.1.20";
   by-version."tar"."0.1.20" = self.buildNodePackage {
     name = "tar-0.1.20";
+    version = "0.1.20";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
@@ -28110,7 +37187,11 @@
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar"."~1.0.1" =
     self.by-version."tar"."1.0.3";
@@ -28122,6 +37203,7 @@
     self.by-version."tar-fs"."0.5.2";
   by-version."tar-fs"."0.5.2" = self.buildNodePackage {
     name = "tar-fs-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz";
@@ -28133,12 +37215,17 @@
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
       "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar-pack"."~2.0.0" =
     self.by-version."tar-pack"."2.0.0";
   by-version."tar-pack"."2.0.0" = self.buildNodePackage {
     name = "tar-pack-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz";
@@ -28154,14 +37241,19 @@
       "tar-0.1.20" = self.by-version."tar"."0.1.20";
       "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar-stream"."^0.4.6" =
     self.by-version."tar-stream"."0.4.7";
   by-version."tar-stream"."0.4.7" = self.buildNodePackage {
     name = "tar-stream-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz";
@@ -28174,12 +37266,17 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tar-stream"."~1.0.0" =
     self.by-version."tar-stream"."1.0.2";
   by-version."tar-stream"."1.0.2" = self.buildNodePackage {
     name = "tar-stream-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz";
@@ -28192,12 +37289,17 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."temp"."*" =
     self.by-version."temp"."0.8.1";
   by-version."temp"."0.8.1" = self.buildNodePackage {
     name = "temp-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
@@ -28207,13 +37309,18 @@
     deps = {
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "temp" = self.by-version."temp"."0.8.1";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = self.buildNodePackage {
     name = "temp-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
@@ -28224,7 +37331,11 @@
       "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."temp".">=0.5.0" =
     self.by-version."temp"."0.8.1";
@@ -28232,6 +37343,7 @@
     self.by-version."temp"."0.5.1";
   by-version."temp"."0.5.1" = self.buildNodePackage {
     name = "temp-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
@@ -28241,7 +37353,11 @@
     deps = {
       "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
@@ -28251,6 +37367,7 @@
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = self.buildNodePackage {
     name = "text-table-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
@@ -28259,12 +37376,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thenify"."3" =
     self.by-version."thenify"."3.1.0";
   by-version."thenify"."3.1.0" = self.buildNodePackage {
     name = "thenify-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz";
@@ -28274,7 +37396,11 @@
     deps = {
       "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thenify".">= 3.1.0 < 4" =
     self.by-version."thenify"."3.1.0";
@@ -28282,6 +37408,7 @@
     self.by-version."thenify-all"."1.6.0";
   by-version."thenify-all"."1.6.0" = self.buildNodePackage {
     name = "thenify-all-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz";
@@ -28291,12 +37418,17 @@
     deps = {
       "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thirty-two"."~0.0.1" =
     self.by-version."thirty-two"."0.0.2";
   by-version."thirty-two"."0.0.2" = self.buildNodePackage {
     name = "thirty-two-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz";
@@ -28305,12 +37437,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = self.buildNodePackage {
     name = "throttleit-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
@@ -28319,12 +37456,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through"."2.3.4" =
     self.by-version."through"."2.3.4";
   by-version."through"."2.3.4" = self.buildNodePackage {
     name = "through-2.3.4";
+    version = "2.3.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
@@ -28333,12 +37475,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through".">=2.2.7 <3" =
     self.by-version."through"."2.3.6";
   by-version."through"."2.3.6" = self.buildNodePackage {
     name = "through-2.3.6";
+    version = "2.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
@@ -28347,12 +37494,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through"."~2.2.0" =
     self.by-version."through"."2.2.7";
   by-version."through"."2.2.7" = self.buildNodePackage {
     name = "through-2.2.7";
+    version = "2.2.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
@@ -28361,16 +37513,23 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through"."~2.2.7" =
     self.by-version."through"."2.2.7";
   by-spec."through"."~2.3.4" =
     self.by-version."through"."2.3.6";
+  by-spec."through"."~2.3.6" =
+    self.by-version."through"."2.3.6";
   by-spec."through2"."0.6.3" =
     self.by-version."through2"."0.6.3";
   by-version."through2"."0.6.3" = self.buildNodePackage {
     name = "through2-0.6.3";
+    version = "0.6.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz";
@@ -28381,7 +37540,11 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through2"."^0.6.1" =
     self.by-version."through2"."0.6.3";
@@ -28391,6 +37554,7 @@
     self.by-version."through2"."1.1.1";
   by-version."through2"."1.1.1" = self.buildNodePackage {
     name = "through2-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
@@ -28401,12 +37565,17 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through2"."~0.4.1" =
     self.by-version."through2"."0.4.2";
   by-version."through2"."0.4.2" = self.buildNodePackage {
     name = "through2-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
@@ -28417,12 +37586,17 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-2.1.2" = self.by-version."xtend"."2.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."through2"."~0.5.1" =
     self.by-version."through2"."0.5.1";
   by-version."through2"."0.5.1" = self.buildNodePackage {
     name = "through2-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
@@ -28433,12 +37607,17 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thunkify"."~2.1.1" =
     self.by-version."thunkify"."2.1.2";
   by-version."thunkify"."2.1.2" = self.buildNodePackage {
     name = "thunkify-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz";
@@ -28447,12 +37626,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thunky"."^0.1.0" =
     self.by-version."thunky"."0.1.0";
   by-version."thunky"."0.1.0" = self.buildNodePackage {
     name = "thunky-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz";
@@ -28461,7 +37645,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."thunky"."~0.1.0" =
     self.by-version."thunky"."0.1.0";
@@ -28469,6 +37657,7 @@
     self.by-version."tildify"."1.0.0";
   by-version."tildify"."1.0.0" = self.buildNodePackage {
     name = "tildify-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
@@ -28478,12 +37667,17 @@
     deps = {
       "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."time".">=0.9.2" =
     self.by-version."time"."0.11.1";
   by-version."time"."0.11.1" = self.buildNodePackage {
     name = "time-0.11.1";
+    version = "0.11.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/time/-/time-0.11.1.tgz";
@@ -28495,12 +37689,17 @@
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."time-line"."^1.0.1" =
     self.by-version."time-line"."1.0.1";
   by-version."time-line"."1.0.1" = self.buildNodePackage {
     name = "time-line-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz";
@@ -28509,12 +37708,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timed-out"."^2.0.0" =
     self.by-version."timed-out"."2.0.0";
   by-version."timed-out"."2.0.0" = self.buildNodePackage {
     name = "timed-out-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
@@ -28523,12 +37727,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timers-browserify"."^1.0.1" =
     self.by-version."timers-browserify"."1.3.0";
   by-version."timers-browserify"."1.3.0" = self.buildNodePackage {
     name = "timers-browserify-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.3.0.tgz";
@@ -28538,12 +37747,17 @@
     deps = {
       "process-0.10.0" = self.by-version."process"."0.10.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timers-browserify"."~1.0.1" =
     self.by-version."timers-browserify"."1.0.3";
   by-version."timers-browserify"."1.0.3" = self.buildNodePackage {
     name = "timers-browserify-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
@@ -28553,12 +37767,17 @@
     deps = {
       "process-0.5.2" = self.by-version."process"."0.5.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timers-ext"."0.1" =
     self.by-version."timers-ext"."0.1.0";
   by-version."timers-ext"."0.1.0" = self.buildNodePackage {
     name = "timers-ext-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz";
@@ -28569,7 +37788,11 @@
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
       "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timers-ext"."0.1.x" =
     self.by-version."timers-ext"."0.1.0";
@@ -28577,6 +37800,7 @@
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = self.buildNodePackage {
     name = "timespan-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
@@ -28585,7 +37809,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
@@ -28593,6 +37821,7 @@
     self.by-version."timezone"."0.0.39";
   by-version."timezone"."0.0.39" = self.buildNodePackage {
     name = "timezone-0.0.39";
+    version = "0.0.39";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timezone/-/timezone-0.0.39.tgz";
@@ -28601,13 +37830,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "timezone" = self.by-version."timezone"."0.0.39";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = self.buildNodePackage {
     name = "tinycolor-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
@@ -28616,17 +37850,22 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."titanium"."*" =
-    self.by-version."titanium"."3.4.1";
-  by-version."titanium"."3.4.1" = self.buildNodePackage {
-    name = "titanium-3.4.1";
+    self.by-version."titanium"."3.4.2-alpha";
+  by-version."titanium"."3.4.2-alpha" = self.buildNodePackage {
+    name = "titanium-3.4.2-alpha";
+    version = "3.4.2-alpha";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/titanium/-/titanium-3.4.1.tgz";
-      name = "titanium-3.4.1.tgz";
-      sha1 = "af10520a20dfcacaadfde07a2572b82f2b9d3648";
+      url = "http://registry.npmjs.org/titanium/-/titanium-3.4.2-alpha.tgz";
+      name = "titanium-3.4.2-alpha.tgz";
+      sha1 = "bea444d0e5d3476e09493ea617755c12a0bb474b";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
@@ -28636,7 +37875,7 @@
       "jade-0.35.0" = self.by-version."jade"."0.35.0";
       "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4";
       "moment-2.4.0" = self.by-version."moment"."2.4.0";
-      "node-appc-0.2.14" = self.by-version."node-appc"."0.2.14";
+      "node-appc-0.2.24" = self.by-version."node-appc"."0.2.24";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "request-2.27.0" = self.by-version."request"."2.27.0";
       "semver-2.2.1" = self.by-version."semver"."2.2.1";
@@ -28645,13 +37884,18 @@
       "winston-0.6.2" = self.by-version."winston"."0.6.2";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "titanium" = self.by-version."titanium"."3.4.1";
+  "titanium" = self.by-version."titanium"."3.4.2-alpha";
   by-spec."tldtools"."0.0.19" =
     self.by-version."tldtools"."0.0.19";
   by-version."tldtools"."0.0.19" = self.buildNodePackage {
     name = "tldtools-0.0.19";
+    version = "0.0.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.19.tgz";
@@ -28661,12 +37905,17 @@
     deps = {
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tldtools".">=0.0.19" =
     self.by-version."tldtools"."0.0.23";
   by-version."tldtools"."0.0.23" = self.buildNodePackage {
     name = "tldtools-0.0.23";
+    version = "0.0.23";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.23.tgz";
@@ -28676,7 +37925,11 @@
     deps = {
       "request-2.53.0" = self.by-version."request"."2.53.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tldtools".">=0.0.6" =
     self.by-version."tldtools"."0.0.23";
@@ -28684,6 +37937,7 @@
     self.by-version."tls-connect"."0.2.2";
   by-version."tls-connect"."0.2.2" = self.buildNodePackage {
     name = "tls-connect-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz";
@@ -28692,7 +37946,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tls-connect"."~0.2.0" =
     self.by-version."tls-connect"."0.2.2";
@@ -28702,6 +37960,7 @@
     self.by-version."tmp"."0.0.23";
   by-version."tmp"."0.0.23" = self.buildNodePackage {
     name = "tmp-0.0.23";
+    version = "0.0.23";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
@@ -28710,12 +37969,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tmp"."0.0.24" =
     self.by-version."tmp"."0.0.24";
   by-version."tmp"."0.0.24" = self.buildNodePackage {
     name = "tmp-0.0.24";
+    version = "0.0.24";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
@@ -28724,7 +37988,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.24";
@@ -28732,6 +38000,7 @@
     self.by-version."to-array"."0.1.3";
   by-version."to-array"."0.1.3" = self.buildNodePackage {
     name = "to-array-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz";
@@ -28740,12 +38009,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tomahawk"."0.1.6" =
     self.by-version."tomahawk"."0.1.6";
   by-version."tomahawk"."0.1.6" = self.buildNodePackage {
     name = "tomahawk-0.1.6";
+    version = "0.1.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/tomahawk/-/tomahawk-0.1.6.tgz";
@@ -28762,12 +38036,17 @@
       "socket.io-1.0.6" = self.by-version."socket.io"."1.0.6";
       "winston-0.7.3" = self.by-version."winston"."0.7.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tomahawk-plugin-kv-memory-store"."0.0.3" =
     self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3";
   by-version."tomahawk-plugin-kv-memory-store"."0.0.3" = self.buildNodePackage {
     name = "tomahawk-plugin-kv-memory-store-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tomahawk-plugin-kv-memory-store/-/tomahawk-plugin-kv-memory-store-0.0.3.tgz";
@@ -28776,12 +38055,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."toobusy"."*" =
+  by-spec."toobusy"."~0.2.4" =
     self.by-version."toobusy"."0.2.4";
   by-version."toobusy"."0.2.4" = self.buildNodePackage {
     name = "toobusy-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz";
@@ -28791,45 +38075,17 @@
     deps = {
       "bindings-1.1.0" = self.by-version."bindings"."1.1.0";
     };
-    peerDependencies = [];
-  };
-  "toobusy" = self.by-version."toobusy"."0.2.4";
-  by-spec."toobusy"."~0.2.4" =
-    self.by-version."toobusy"."0.2.4";
-  by-spec."torrent-stream"."^0.15.1" =
-    self.by-version."torrent-stream"."0.15.1";
-  by-version."torrent-stream"."0.15.1" = self.buildNodePackage {
-    name = "torrent-stream-0.15.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.15.1.tgz";
-      name = "torrent-stream-0.15.1.tgz";
-      sha1 = "98c86f8c135a58a7cd63e8cd7a78b99430473e06";
-    };
-    deps = {
-      "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4";
-      "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
-      "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
-      "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
-      "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
-      "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0";
-      "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0";
-      "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2";
-      "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."torrent-stream"."^0.16.2" =
     self.by-version."torrent-stream"."0.16.2";
   by-version."torrent-stream"."0.16.2" = self.buildNodePackage {
     name = "torrent-stream-0.16.2";
+    version = "0.16.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz";
@@ -28854,12 +38110,17 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."torrent-stream"."~0.13.3" =
     self.by-version."torrent-stream"."0.13.5";
   by-version."torrent-stream"."0.13.5" = self.buildNodePackage {
     name = "torrent-stream-0.13.5";
+    version = "0.13.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz";
@@ -28883,12 +38144,17 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."touch"."0.0.2" =
     self.by-version."touch"."0.0.2";
   by-version."touch"."0.0.2" = self.buildNodePackage {
     name = "touch-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
@@ -28898,12 +38164,17 @@
     deps = {
       "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."touch"."~0.0.3" =
     self.by-version."touch"."0.0.3";
   by-version."touch"."0.0.3" = self.buildNodePackage {
     name = "touch-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/touch/-/touch-0.0.3.tgz";
@@ -28913,12 +38184,17 @@
     deps = {
       "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tough-cookie".">=0.12.0" =
     self.by-version."tough-cookie"."0.12.1";
   by-version."tough-cookie"."0.12.1" = self.buildNodePackage {
     name = "tough-cookie-0.12.1";
+    version = "0.12.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
@@ -28928,7 +38204,11 @@
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tough-cookie"."^0.12.1" =
     self.by-version."tough-cookie"."0.12.1";
@@ -28936,6 +38216,7 @@
     self.by-version."tough-cookie"."0.9.15";
   by-version."tough-cookie"."0.9.15" = self.buildNodePackage {
     name = "tough-cookie-0.9.15";
+    version = "0.9.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
@@ -28945,12 +38226,17 @@
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."traceur"."0.0.55" =
     self.by-version."traceur"."0.0.55";
   by-version."traceur"."0.0.55" = self.buildNodePackage {
     name = "traceur-0.0.55";
+    version = "0.0.55";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
@@ -28962,12 +38248,17 @@
       "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
   by-version."transformers"."2.1.0" = self.buildNodePackage {
     name = "transformers-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
@@ -28979,12 +38270,17 @@
       "css-1.0.8" = self.by-version."css"."1.0.8";
       "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."trash"."*" =
     self.by-version."trash"."1.4.1";
   by-version."trash"."1.4.1" = self.buildNodePackage {
     name = "trash-1.4.1";
+    version = "1.4.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/trash/-/trash-1.4.1.tgz";
@@ -28998,13 +38294,18 @@
       "win-trash-1.0.0" = self.by-version."win-trash"."1.0.0";
       "xdg-trash-1.0.6" = self.by-version."xdg-trash"."1.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "trash" = self.by-version."trash"."1.4.1";
   by-spec."traverse"."0.6.x" =
     self.by-version."traverse"."0.6.6";
   by-version."traverse"."0.6.6" = self.buildNodePackage {
     name = "traverse-0.6.6";
+    version = "0.6.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
@@ -29013,7 +38314,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."traverse".">=0.2.4" =
     self.by-version."traverse"."0.6.6";
@@ -29021,6 +38326,7 @@
     self.by-version."traverse"."0.3.9";
   by-version."traverse"."0.3.9" = self.buildNodePackage {
     name = "traverse-0.3.9";
+    version = "0.3.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
@@ -29029,12 +38335,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."traverse"."~0.5.1" =
     self.by-version."traverse"."0.5.2";
   by-version."traverse"."0.5.2" = self.buildNodePackage {
     name = "traverse-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
@@ -29043,12 +38354,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."truncate"."~1.0.2" =
     self.by-version."truncate"."1.0.4";
   by-version."truncate"."1.0.4" = self.buildNodePackage {
     name = "truncate-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz";
@@ -29057,12 +38373,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tryor"."~0.1.2" =
     self.by-version."tryor"."0.1.2";
   by-version."tryor"."0.1.2" = self.buildNodePackage {
     name = "tryor-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz";
@@ -29071,12 +38392,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."tty-browserify"."~0.0.0" =
+  by-spec."tty-browserify"."0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
   by-version."tty-browserify"."0.0.0" = self.buildNodePackage {
     name = "tty-browserify-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
@@ -29085,12 +38411,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."tty-browserify"."~0.0.0" =
+    self.by-version."tty-browserify"."0.0.0";
   by-spec."tunnel-agent"."~0.2.0" =
     self.by-version."tunnel-agent"."0.2.0";
   by-version."tunnel-agent"."0.2.0" = self.buildNodePackage {
     name = "tunnel-agent-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
@@ -29099,12 +38432,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tunnel-agent"."~0.3.0" =
     self.by-version."tunnel-agent"."0.3.0";
   by-version."tunnel-agent"."0.3.0" = self.buildNodePackage {
     name = "tunnel-agent-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
@@ -29113,12 +38451,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tunnel-agent"."~0.4.0" =
     self.by-version."tunnel-agent"."0.4.0";
   by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
     name = "tunnel-agent-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
@@ -29127,31 +38470,61 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."twilio".">=1.1.4" =
-    self.by-version."twilio"."1.10.0";
-  by-version."twilio"."1.10.0" = self.buildNodePackage {
-    name = "twilio-1.10.0";
+    self.by-version."twilio"."1.11.0";
+  by-version."twilio"."1.11.0" = self.buildNodePackage {
+    name = "twilio-1.11.0";
+    version = "1.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/twilio/-/twilio-1.10.0.tgz";
-      name = "twilio-1.10.0.tgz";
-      sha1 = "b4004f1187baf818233a4dd5e13478d8df9101da";
+      url = "http://registry.npmjs.org/twilio/-/twilio-1.11.0.tgz";
+      name = "twilio-1.11.0.tgz";
+      sha1 = "ac49109fbbf761d1b3efad5e49ae1bbb95135700";
     };
     deps = {
       "request-2.27.0" = self.by-version."request"."2.27.0";
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
       "jwt-simple-0.1.0" = self.by-version."jwt-simple"."0.1.0";
       "q-0.9.7" = self.by-version."q"."0.9.7";
       "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."twitter-ng"."0.6.2" =
+    self.by-version."twitter-ng"."0.6.2";
+  by-version."twitter-ng"."0.6.2" = self.buildNodePackage {
+    name = "twitter-ng-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz";
+      name = "twitter-ng-0.6.2.tgz";
+      sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
+    };
+    deps = {
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."type-check"."~0.3.1" =
     self.by-version."type-check"."0.3.1";
   by-version."type-check"."0.3.1" = self.buildNodePackage {
     name = "type-check-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz";
@@ -29161,12 +38534,17 @@
     deps = {
       "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = self.buildNodePackage {
     name = "type-detect-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
@@ -29175,12 +38553,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."type-is"."~1.3.2" =
     self.by-version."type-is"."1.3.2";
   by-version."type-is"."1.3.2" = self.buildNodePackage {
     name = "type-is-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
@@ -29191,12 +38574,17 @@
       "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."type-is"."~1.5.1" =
     self.by-version."type-is"."1.5.7";
   by-version."type-is"."1.5.7" = self.buildNodePackage {
     name = "type-is-1.5.7";
+    version = "1.5.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
@@ -29207,7 +38595,11 @@
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."type-is"."~1.5.2" =
     self.by-version."type-is"."1.5.7";
@@ -29215,12 +38607,11 @@
     self.by-version."type-is"."1.5.7";
   by-spec."type-is"."~1.5.5" =
     self.by-version."type-is"."1.5.7";
-  by-spec."type-is"."~1.5.6" =
-    self.by-version."type-is"."1.5.7";
   by-spec."type-is"."~1.6.0" =
     self.by-version."type-is"."1.6.0";
   by-version."type-is"."1.6.0" = self.buildNodePackage {
     name = "type-is-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/type-is/-/type-is-1.6.0.tgz";
@@ -29231,12 +38622,17 @@
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = self.buildNodePackage {
     name = "typechecker-2.0.8";
+    version = "2.0.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
@@ -29245,12 +38641,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."typedarray"."~0.0.5" =
     self.by-version."typedarray"."0.0.6";
   by-version."typedarray"."0.0.6" = self.buildNodePackage {
     name = "typedarray-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
@@ -29259,12 +38660,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."typescript"."*" =
     self.by-version."typescript"."1.4.1";
   by-version."typescript"."1.4.1" = self.buildNodePackage {
     name = "typescript-1.4.1";
+    version = "1.4.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz";
@@ -29273,13 +38679,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "typescript" = self.by-version."typescript"."1.4.1";
   by-spec."uglify-js"."*" =
     self.by-version."uglify-js"."2.4.16";
   by-version."uglify-js"."2.4.16" = self.buildNodePackage {
     name = "uglify-js-2.4.16";
+    version = "2.4.16";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
@@ -29292,13 +38703,18 @@
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "uglify-js" = self.by-version."uglify-js"."2.4.16";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = self.buildNodePackage {
     name = "uglify-js-1.2.5";
+    version = "1.2.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
@@ -29307,12 +38723,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uglify-js"."2.4.0" =
     self.by-version."uglify-js"."2.4.0";
   by-version."uglify-js"."2.4.0" = self.buildNodePackage {
     name = "uglify-js-2.4.0";
+    version = "2.4.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
@@ -29325,8 +38746,14 @@
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."uglify-js"."2.4.16" =
+    self.by-version."uglify-js"."2.4.16";
   by-spec."uglify-js"."^2.4.0" =
     self.by-version."uglify-js"."2.4.16";
   by-spec."uglify-js"."^2.4.15" =
@@ -29335,6 +38762,7 @@
     self.by-version."uglify-js"."1.1.1";
   by-version."uglify-js"."1.1.1" = self.buildNodePackage {
     name = "uglify-js-1.1.1";
+    version = "1.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
@@ -29343,12 +38771,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = self.buildNodePackage {
     name = "uglify-js-2.2.5";
+    version = "2.2.5";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
@@ -29359,7 +38792,11 @@
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uglify-js"."~2.2.5" =
     self.by-version."uglify-js"."2.2.5";
@@ -29367,6 +38804,7 @@
     self.by-version."uglify-js"."2.3.6";
   by-version."uglify-js"."2.3.6" = self.buildNodePackage {
     name = "uglify-js-2.3.6";
+    version = "2.3.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
@@ -29378,16 +38816,23 @@
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  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.16";
+  by-spec."uglify-js"."~2.4.13" =
+    self.by-version."uglify-js"."2.4.16";
+  by-spec."uglify-js"."~2.4.15" =
+    self.by-version."uglify-js"."2.4.16";
   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" = self.buildNodePackage {
     name = "uglify-to-browserify-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
@@ -29396,12 +38841,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uid"."0.0.2" =
+    self.by-version."uid"."0.0.2";
+  by-version."uid"."0.0.2" = self.buildNodePackage {
+    name = "uid-0.0.2";
+    version = "0.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid/-/uid-0.0.2.tgz";
+      name = "uid-0.0.2.tgz";
+      sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-number"."0.0.3" =
     self.by-version."uid-number"."0.0.3";
   by-version."uid-number"."0.0.3" = self.buildNodePackage {
     name = "uid-number-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
@@ -29410,12 +38879,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-number"."0.0.5" =
     self.by-version."uid-number"."0.0.5";
   by-version."uid-number"."0.0.5" = self.buildNodePackage {
     name = "uid-number-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
@@ -29424,12 +38898,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-number"."0.0.6" =
     self.by-version."uid-number"."0.0.6";
   by-version."uid-number"."0.0.6" = self.buildNodePackage {
     name = "uid-number-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
@@ -29438,12 +38917,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-safe"."1.0.1" =
     self.by-version."uid-safe"."1.0.1";
   by-version."uid-safe"."1.0.1" = self.buildNodePackage {
     name = "uid-safe-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
@@ -29454,12 +38938,17 @@
       "mz-1.3.0" = self.by-version."mz"."1.3.0";
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-safe"."1.1.0" =
     self.by-version."uid-safe"."1.1.0";
   by-version."uid-safe"."1.1.0" = self.buildNodePackage {
     name = "uid-safe-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz";
@@ -29470,7 +38959,11 @@
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
       "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid-safe"."~1.1.0" =
     self.by-version."uid-safe"."1.1.0";
@@ -29478,6 +38971,7 @@
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = self.buildNodePackage {
     name = "uid2-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
@@ -29486,7 +38980,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uid2"."0.0.x" =
     self.by-version."uid2"."0.0.3";
@@ -29496,6 +38994,7 @@
     self.by-version."ultron"."1.0.1";
   by-version."ultron"."1.0.1" = self.buildNodePackage {
     name = "ultron-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz";
@@ -29504,12 +39003,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."umask"."~1.1.0" =
     self.by-version."umask"."1.1.0";
   by-version."umask"."1.1.0" = self.buildNodePackage {
     name = "umask-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
@@ -29518,12 +39022,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."umd"."^2.1.0" =
     self.by-version."umd"."2.1.0";
   by-version."umd"."2.1.0" = self.buildNodePackage {
     name = "umd-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
@@ -29536,12 +39045,36 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."umd"."^3.0.0" =
+    self.by-version."umd"."3.0.0";
+  by-version."umd"."3.0.0" = self.buildNodePackage {
+    name = "umd-3.0.0";
+    version = "3.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/umd/-/umd-3.0.0.tgz";
+      name = "umd-3.0.0.tgz";
+      sha1 = "328de29bf1004abb4d6309d7fff1b84b9f823b83";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."umd"."~2.0.0" =
     self.by-version."umd"."2.0.0";
   by-version."umd"."2.0.0" = self.buildNodePackage {
     name = "umd-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
@@ -29554,29 +39087,39 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."umd"."~2.1.0" =
     self.by-version."umd"."2.1.0";
   by-spec."underscore"."*" =
-    self.by-version."underscore"."1.7.0";
-  by-version."underscore"."1.7.0" = self.buildNodePackage {
-    name = "underscore-1.7.0";
+    self.by-version."underscore"."1.8.2";
+  by-version."underscore"."1.8.2" = self.buildNodePackage {
+    name = "underscore-1.8.2";
+    version = "1.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
-      name = "underscore-1.7.0.tgz";
-      sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
+      name = "underscore-1.8.2.tgz";
+      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "underscore" = self.by-version."underscore"."1.7.0";
+  "underscore" = self.by-version."underscore"."1.8.2";
   by-spec."underscore"."1.2.1" =
     self.by-version."underscore"."1.2.1";
   by-version."underscore"."1.2.1" = self.buildNodePackage {
     name = "underscore-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
@@ -29585,12 +39128,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."1.3.3" =
     self.by-version."underscore"."1.3.3";
   by-version."underscore"."1.3.3" = self.buildNodePackage {
     name = "underscore-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz";
@@ -29599,12 +39147,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."1.6.x" =
     self.by-version."underscore"."1.6.0";
   by-version."underscore"."1.6.0" = self.buildNodePackage {
     name = "underscore-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
@@ -29613,28 +39166,50 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."1.7.0" =
     self.by-version."underscore"."1.7.0";
+  by-version."underscore"."1.7.0" = self.buildNodePackage {
+    name = "underscore-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+      name = "underscore-1.7.0.tgz";
+      sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."underscore"."1.x" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore".">=1.5.0" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore".">=1.5.2" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore"."^1.6.0" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore"."^1.7.0" =
-    self.by-version."underscore"."1.7.0";
+    self.by-version."underscore"."1.8.2";
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = self.buildNodePackage {
     name = "underscore-1.4.4";
+    version = "1.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
@@ -29643,7 +39218,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
@@ -29651,6 +39230,7 @@
     self.by-version."underscore"."1.5.2";
   by-version."underscore"."1.5.2" = self.buildNodePackage {
     name = "underscore-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
@@ -29659,7 +39239,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.7.0" =
     self.by-version."underscore"."1.7.0";
@@ -29667,6 +39251,7 @@
     self.by-version."underscore.string"."2.2.1";
   by-version."underscore.string"."2.2.1" = self.buildNodePackage {
     name = "underscore.string-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
@@ -29675,12 +39260,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore.string"."~2.3.1" =
     self.by-version."underscore.string"."2.3.3";
   by-version."underscore.string"."2.3.3" = self.buildNodePackage {
     name = "underscore.string-2.3.3";
+    version = "2.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
@@ -29689,7 +39279,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore.string"."~2.3.3" =
     self.by-version."underscore.string"."2.3.3";
@@ -29697,6 +39291,7 @@
     self.by-version."underscore.string"."2.4.0";
   by-version."underscore.string"."2.4.0" = self.buildNodePackage {
     name = "underscore.string-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
@@ -29705,12 +39300,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."unfunk-diff"."~0.0.1" =
     self.by-version."unfunk-diff"."0.0.2";
   by-version."unfunk-diff"."0.0.2" = self.buildNodePackage {
     name = "unfunk-diff-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
@@ -29722,12 +39322,17 @@
       "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3";
       "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ungit"."*" =
     self.by-version."ungit"."0.8.4";
   by-version."ungit"."0.8.4" = self.buildNodePackage {
     name = "ungit-0.8.4";
+    version = "0.8.4";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz";
@@ -29769,13 +39374,18 @@
       "express-session-1.9.3" = self.by-version."express-session"."1.9.3";
       "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "ungit" = self.by-version."ungit"."0.8.4";
   by-spec."unique-stream"."^1.0.0" =
     self.by-version."unique-stream"."1.0.0";
   by-version."unique-stream"."1.0.0" = self.buildNodePackage {
     name = "unique-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
@@ -29784,12 +39394,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."unorm"."1.3.3" =
     self.by-version."unorm"."1.3.3";
   by-version."unorm"."1.3.3" = self.buildNodePackage {
     name = "unorm-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz";
@@ -29798,12 +39413,37 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."untildify"."^1.0.0" =
+    self.by-version."untildify"."1.0.0";
+  by-version."untildify"."1.0.0" = self.buildNodePackage {
+    name = "untildify-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/untildify/-/untildify-1.0.0.tgz";
+      name = "untildify-1.0.0.tgz";
+      sha1 = "4d8031d1806f4fbd7c42b0237aaf213686262635";
+    };
+    deps = {
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."update-notifier"."0.2.0" =
     self.by-version."update-notifier"."0.2.0";
   by-version."update-notifier"."0.2.0" = self.buildNodePackage {
     name = "update-notifier-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz";
@@ -29817,12 +39457,17 @@
       "semver-diff-0.1.0" = self.by-version."semver-diff"."0.1.0";
       "string-length-0.1.2" = self.by-version."string-length"."0.1.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."update-notifier"."^0.3.0" =
     self.by-version."update-notifier"."0.3.0";
   by-version."update-notifier"."0.3.0" = self.buildNodePackage {
     name = "update-notifier-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.0.tgz";
@@ -29837,12 +39482,17 @@
       "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0";
       "string-length-1.0.0" = self.by-version."string-length"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uri-path"."0.0.2" =
     self.by-version."uri-path"."0.0.2";
   by-version."uri-path"."0.0.2" = self.buildNodePackage {
     name = "uri-path-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz";
@@ -29851,12 +39501,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."url"."~0.10.1" =
     self.by-version."url"."0.10.2";
   by-version."url"."0.10.2" = self.buildNodePackage {
     name = "url-0.10.2";
+    version = "0.10.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/url/-/url-0.10.2.tgz";
@@ -29866,12 +39521,17 @@
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."url"."~0.7.9" =
     self.by-version."url"."0.7.9";
   by-version."url"."0.7.9" = self.buildNodePackage {
     name = "url-0.7.9";
+    version = "0.7.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
@@ -29882,12 +39542,17 @@
       "querystring-0.1.0" = self.by-version."querystring"."0.1.0";
       "punycode-1.0.0" = self.by-version."punycode"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."user-home"."^1.0.0" =
     self.by-version."user-home"."1.1.1";
   by-version."user-home"."1.1.1" = self.buildNodePackage {
     name = "user-home-1.1.1";
+    version = "1.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
@@ -29896,7 +39561,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."user-home"."^1.1.0" =
     self.by-version."user-home"."1.1.1";
@@ -29904,6 +39573,7 @@
     self.by-version."useragent"."2.0.10";
   by-version."useragent"."2.0.10" = self.buildNodePackage {
     name = "useragent-2.0.10";
+    version = "2.0.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz";
@@ -29913,12 +39583,17 @@
     deps = {
       "lru-cache-2.2.4" = self.by-version."lru-cache"."2.2.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utf-8-validate"."1.0.x" =
     self.by-version."utf-8-validate"."1.0.1";
   by-version."utf-8-validate"."1.0.1" = self.buildNodePackage {
     name = "utf-8-validate-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz";
@@ -29929,12 +39604,36 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utf7"."1.0.0" =
+    self.by-version."utf7"."1.0.0";
+  by-version."utf7"."1.0.0" = self.buildNodePackage {
+    name = "utf7-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz";
+      name = "utf7-1.0.0.tgz";
+      sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utf8"."2.0.0" =
     self.by-version."utf8"."2.0.0";
   by-version."utf8"."2.0.0" = self.buildNodePackage {
     name = "utf8-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz";
@@ -29943,12 +39642,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utfx"."~1.0.0" =
     self.by-version."utfx"."1.0.0";
   by-version."utfx"."1.0.0" = self.buildNodePackage {
     name = "utfx-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utfx/-/utfx-1.0.0.tgz";
@@ -29957,12 +39661,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."util"."0.10.3" =
     self.by-version."util"."0.10.3";
   by-version."util"."0.10.3" = self.buildNodePackage {
     name = "util-0.10.3";
+    version = "0.10.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
@@ -29972,12 +39681,17 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."util"."0.4.9" =
     self.by-version."util"."0.4.9";
   by-version."util"."0.4.9" = self.buildNodePackage {
     name = "util-0.4.9";
+    version = "0.4.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
@@ -29987,16 +39701,23 @@
     deps = {
       "events.node-0.4.9" = self.by-version."events.node"."0.4.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."util".">=0.10.3 <1" =
     self.by-version."util"."0.10.3";
   by-spec."util"."~0.10.1" =
     self.by-version."util"."0.10.3";
+  by-spec."util"."~0.10.3" =
+    self.by-version."util"."0.10.3";
   by-spec."util-deprecate"."1.0.0" =
     self.by-version."util-deprecate"."1.0.0";
   by-version."util-deprecate"."1.0.0" = self.buildNodePackage {
     name = "util-deprecate-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz";
@@ -30005,12 +39726,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."util-extend"."^1.0.1" =
     self.by-version."util-extend"."1.0.1";
   by-version."util-extend"."1.0.1" = self.buildNodePackage {
     name = "util-extend-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
@@ -30019,12 +39745,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
   by-version."utile"."0.1.7" = self.buildNodePackage {
     name = "utile-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
@@ -30039,12 +39770,17 @@
       "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
       "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utile"."0.2.1" =
     self.by-version."utile"."0.2.1";
   by-version."utile"."0.2.1" = self.buildNodePackage {
     name = "utile-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
@@ -30059,7 +39795,11 @@
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utile"."0.2.x" =
     self.by-version."utile"."0.2.1";
@@ -30069,6 +39809,7 @@
     self.by-version."utils-merge"."1.0.0";
   by-version."utils-merge"."1.0.0" = self.buildNodePackage {
     name = "utils-merge-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
@@ -30077,7 +39818,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."utils-merge"."1.x.x" =
     self.by-version."utils-merge"."1.0.0";
@@ -30085,6 +39830,7 @@
     self.by-version."uuid"."2.0.1";
   by-version."uuid"."2.0.1" = self.buildNodePackage {
     name = "uuid-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
@@ -30093,7 +39839,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."uuid"."~2.0.1" =
     self.by-version."uuid"."2.0.1";
@@ -30101,6 +39851,7 @@
     self.by-version."v8-debug"."0.3.5";
   by-version."v8-debug"."0.3.5" = self.buildNodePackage {
     name = "v8-debug-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.5.tgz";
@@ -30111,28 +39862,38 @@
       "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."v8-profiler"."~5.2.0" =
-    self.by-version."v8-profiler"."5.2.3";
-  by-version."v8-profiler"."5.2.3" = self.buildNodePackage {
-    name = "v8-profiler-5.2.3";
+    self.by-version."v8-profiler"."5.2.4";
+  by-version."v8-profiler"."5.2.4" = self.buildNodePackage {
+    name = "v8-profiler-5.2.4";
+    version = "5.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.3.tgz";
-      name = "v8-profiler-5.2.3.tgz";
-      sha1 = "6030cc6ec3bf8679e27b3cded3713a584799895f";
+      url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.4.tgz";
+      name = "v8-profiler-5.2.4.tgz";
+      sha1 = "858df0a98dffb79f5df5de74c21a05f57051d977";
     };
     deps = {
       "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
       "nan-1.5.3" = self.by-version."nan"."1.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."v8flags"."^2.0.2" =
     self.by-version."v8flags"."2.0.2";
   by-version."v8flags"."2.0.2" = self.buildNodePackage {
     name = "v8flags-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.2.tgz";
@@ -30141,12 +39902,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."valid-identifier"."0.0.1" =
     self.by-version."valid-identifier"."0.0.1";
   by-version."valid-identifier"."0.0.1" = self.buildNodePackage {
     name = "valid-identifier-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz";
@@ -30155,12 +39921,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."validator"."1.5.1" =
     self.by-version."validator"."1.5.1";
   by-version."validator"."1.5.1" = self.buildNodePackage {
     name = "validator-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/validator/-/validator-1.5.1.tgz";
@@ -30169,12 +39940,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."validator"."^2.1.0" =
     self.by-version."validator"."2.1.0";
   by-version."validator"."2.1.0" = self.buildNodePackage {
     name = "validator-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz";
@@ -30183,7 +39959,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."validator"."~1.5.1" =
     self.by-version."validator"."1.5.1";
@@ -30191,6 +39971,7 @@
     self.by-version."vargs"."0.1.0";
   by-version."vargs"."0.1.0" = self.buildNodePackage {
     name = "vargs-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
@@ -30199,12 +39980,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vary"."0.1.0" =
     self.by-version."vary"."0.1.0";
   by-version."vary"."0.1.0" = self.buildNodePackage {
     name = "vary-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
@@ -30213,12 +39999,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."vary"."~1.0.0" =
+  by-spec."vary"."^1" =
     self.by-version."vary"."1.0.0";
   by-version."vary"."1.0.0" = self.buildNodePackage {
     name = "vary-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
@@ -30227,12 +40018,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."vary"."~1.0.0" =
+    self.by-version."vary"."1.0.0";
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = self.buildNodePackage {
     name = "vasync-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
@@ -30243,12 +40041,17 @@
       "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
       "verror-1.1.0" = self.by-version."verror"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vasync"."1.4.0" =
     self.by-version."vasync"."1.4.0";
   by-version."vasync"."1.4.0" = self.buildNodePackage {
     name = "vasync-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz";
@@ -30259,12 +40062,17 @@
       "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
       "verror-1.1.0" = self.by-version."verror"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vasync"."1.4.3" =
     self.by-version."vasync"."1.4.3";
   by-version."vasync"."1.4.3" = self.buildNodePackage {
     name = "vasync-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
@@ -30275,12 +40083,17 @@
       "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
       "verror-1.1.0" = self.by-version."verror"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
   by-version."verror"."1.1.0" = self.buildNodePackage {
     name = "verror-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
@@ -30290,12 +40103,17 @@
     deps = {
       "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."verror"."1.3.3" =
     self.by-version."verror"."1.3.3";
   by-version."verror"."1.3.3" = self.buildNodePackage {
     name = "verror-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
@@ -30305,12 +40123,17 @@
     deps = {
       "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."verror"."1.3.6" =
     self.by-version."verror"."1.3.6";
   by-version."verror"."1.3.6" = self.buildNodePackage {
     name = "verror-1.3.6";
+    version = "1.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
@@ -30320,12 +40143,17 @@
     deps = {
       "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."verror"."^1.4.0" =
     self.by-version."verror"."1.6.0";
   by-version."verror"."1.6.0" = self.buildNodePackage {
     name = "verror-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
@@ -30335,12 +40163,17 @@
     deps = {
       "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vhost"."1.0.0" =
     self.by-version."vhost"."1.0.0";
   by-version."vhost"."1.0.0" = self.buildNodePackage {
     name = "vhost-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
@@ -30349,12 +40182,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vhost"."~3.0.0" =
     self.by-version."vhost"."3.0.0";
   by-version."vhost"."3.0.0" = self.buildNodePackage {
     name = "vhost-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
@@ -30363,12 +40201,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."view-helpers"."*" =
     self.by-version."view-helpers"."0.1.5";
   by-version."view-helpers"."0.1.5" = self.buildNodePackage {
     name = "view-helpers-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
@@ -30377,13 +40220,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "view-helpers" = self.by-version."view-helpers"."0.1.5";
   by-spec."vinyl"."^0.4.0" =
     self.by-version."vinyl"."0.4.6";
   by-version."vinyl"."0.4.6" = self.buildNodePackage {
     name = "vinyl-0.4.6";
+    version = "0.4.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
@@ -30394,7 +40242,11 @@
       "clone-0.2.0" = self.by-version."clone"."0.2.0";
       "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vinyl"."^0.4.3" =
     self.by-version."vinyl"."0.4.6";
@@ -30404,6 +40256,7 @@
     self.by-version."vinyl-fs"."0.3.13";
   by-version."vinyl-fs"."0.3.13" = self.buildNodePackage {
     name = "vinyl-fs-0.3.13";
+    version = "0.3.13";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz";
@@ -30420,14 +40273,19 @@
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vinyl-fs"."^0.3.13" =
     self.by-version."vinyl-fs"."0.3.13";
-  by-spec."vm-browserify"."~0.0.1" =
+  by-spec."vm-browserify"."0.0.4" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = self.buildNodePackage {
     name = "vm-browserify-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
@@ -30437,12 +40295,19 @@
     deps = {
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."vm-browserify"."~0.0.1" =
+    self.by-version."vm-browserify"."0.0.4";
   by-spec."voc"."*" =
     self.by-version."voc"."0.5.0";
   by-version."voc"."0.5.0" = self.buildNodePackage {
     name = "voc-0.5.0";
+    version = "0.5.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
@@ -30451,12 +40316,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."void-elements"."~2.0.1" =
     self.by-version."void-elements"."2.0.1";
   by-version."void-elements"."2.0.1" = self.buildNodePackage {
     name = "void-elements-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
@@ -30465,29 +40335,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."vows".">=0.5.13" =
-    self.by-version."vows"."0.9.0-rc2";
-  by-version."vows"."0.9.0-rc2" = self.buildNodePackage {
-    name = "vows-0.9.0-rc2";
+    self.by-version."vows"."0.8.1";
+  by-version."vows"."0.8.1" = self.buildNodePackage {
+    name = "vows-0.8.1";
+    version = "0.8.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc2.tgz";
-      name = "vows-0.9.0-rc2.tgz";
-      sha1 = "8e2bccc46e8db8b5277e09f6818c514e444da631";
+      url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
+      name = "vows-0.8.1.tgz";
+      sha1 = "e09e988ce594ca05a08d72abcca34e88db559131";
     };
     deps = {
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "diff-1.2.2" = self.by-version."diff"."1.2.2";
-      "glob-4.3.5" = self.by-version."glob"."4.3.5";
+      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "glob-4.0.6" = self.by-version."glob"."4.0.6";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."vows".">=0.5.2" =
+    self.by-version."vows"."0.8.1";
   by-spec."walk"."*" =
     self.by-version."walk"."2.3.9";
   by-version."walk"."2.3.9" = self.buildNodePackage {
     name = "walk-2.3.9";
+    version = "2.3.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
@@ -30497,7 +40379,11 @@
     deps = {
       "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "walk" = self.by-version."walk"."2.3.9";
   by-spec."walk"."^2.3.9" =
@@ -30506,6 +40392,7 @@
     self.by-version."ware"."1.2.0";
   by-version."ware"."1.2.0" = self.buildNodePackage {
     name = "ware-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ware/-/ware-1.2.0.tgz";
@@ -30515,12 +40402,17 @@
     deps = {
       "wrap-fn-0.1.4" = self.by-version."wrap-fn"."0.1.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."watch"."0.5.x" =
     self.by-version."watch"."0.5.1";
   by-version."watch"."0.5.1" = self.buildNodePackage {
     name = "watch-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
@@ -30529,12 +40421,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."watch"."~0.13.0" =
     self.by-version."watch"."0.13.0";
   by-version."watch"."0.13.0" = self.buildNodePackage {
     name = "watch-0.13.0";
+    version = "0.13.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz";
@@ -30544,12 +40441,39 @@
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."watchpack"."^0.2.1" =
+    self.by-version."watchpack"."0.2.3";
+  by-version."watchpack"."0.2.3" = self.buildNodePackage {
+    name = "watchpack-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/watchpack/-/watchpack-0.2.3.tgz";
+      name = "watchpack-0.2.3.tgz";
+      sha1 = "b9a5342327ee34a9ff1dfb42762be3a9c08ac214";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3";
+      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wcwidth"."^1.0.0" =
     self.by-version."wcwidth"."1.0.0";
   by-version."wcwidth"."1.0.0" = self.buildNodePackage {
     name = "wcwidth-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
@@ -30559,12 +40483,17 @@
     deps = {
       "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wd"."~0.3.4" =
     self.by-version."wd"."0.3.11";
   by-version."wd"."0.3.11" = self.buildNodePackage {
     name = "wd-0.3.11";
+    version = "0.3.11";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz";
@@ -30580,12 +40509,17 @@
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
       "vargs-0.1.0" = self.by-version."vargs"."0.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."weak-map"."^1.0.5" =
     self.by-version."weak-map"."1.0.5";
   by-version."weak-map"."1.0.5" = self.buildNodePackage {
     name = "weak-map-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
@@ -30594,12 +40528,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."webdrvr"."*" =
     self.by-version."webdrvr"."2.43.0-0";
   by-version."webdrvr"."2.43.0-0" = self.buildNodePackage {
     name = "webdrvr-2.43.0-0";
+    version = "2.43.0-0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz";
@@ -30615,13 +40554,18 @@
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "webdrvr" = self.by-version."webdrvr"."2.43.0-0";
   by-spec."webkit-devtools-agent"."^0.2.4" =
     self.by-version."webkit-devtools-agent"."0.2.5";
   by-version."webkit-devtools-agent"."0.2.5" = self.buildNodePackage {
     name = "webkit-devtools-agent-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/webkit-devtools-agent/-/webkit-devtools-agent-0.2.5.tgz";
@@ -30632,43 +40576,129 @@
       "ws-0.4.31" = self.by-version."ws"."0.4.31";
       "underscore-1.3.3" = self.by-version."underscore"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."webpack"."*" =
+    self.by-version."webpack"."1.5.3";
+  by-version."webpack"."1.5.3" = self.buildNodePackage {
+    name = "webpack-1.5.3";
+    version = "1.5.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/webpack/-/webpack-1.5.3.tgz";
+      name = "webpack-1.5.3.tgz";
+      sha1 = "817a91e1fe70bbaba9400ea49afdfc9a05f4b0c5";
+    };
+    deps = {
+      "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "enhanced-resolve-0.8.4" = self.by-version."enhanced-resolve"."0.8.4";
+      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
+      "clone-0.1.19" = self.by-version."clone"."0.1.19";
+      "webpack-core-0.4.8" = self.by-version."webpack-core"."0.4.8";
+      "node-libs-browser-0.4.1" = self.by-version."node-libs-browser"."0.4.1";
+      "watchpack-0.2.3" = self.by-version."watchpack"."0.2.3";
+      "tapable-0.1.8" = self.by-version."tapable"."0.1.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "webpack" = self.by-version."webpack"."1.5.3";
+  by-spec."webpack-core"."~0.4.8" =
+    self.by-version."webpack-core"."0.4.8";
+  by-version."webpack-core"."0.4.8" = self.buildNodePackage {
+    name = "webpack-core-0.4.8";
+    version = "0.4.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/webpack-core/-/webpack-core-0.4.8.tgz";
+      name = "webpack-core-0.4.8.tgz";
+      sha1 = "07fc55aba81d17dba8cae5a43d6bd69236f8b5f8";
+    };
+    deps = {
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."websocket-driver".">=0.3.6" =
-    self.by-version."websocket-driver"."0.5.1";
-  by-version."websocket-driver"."0.5.1" = self.buildNodePackage {
-    name = "websocket-driver-0.5.1";
+    self.by-version."websocket-driver"."0.5.3";
+  by-version."websocket-driver"."0.5.3" = self.buildNodePackage {
+    name = "websocket-driver-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz";
-      name = "websocket-driver-0.5.1.tgz";
-      sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611";
+      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.3.tgz";
+      name = "websocket-driver-0.5.3.tgz";
+      sha1 = "775d079018f8985e1c255eb8efa9224895acacc3";
     };
     deps = {
-      "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0";
+      "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.5.1";
-  by-spec."websocket-extensions".">=0.1.0" =
-    self.by-version."websocket-extensions"."0.1.0";
-  by-version."websocket-extensions"."0.1.0" = self.buildNodePackage {
-    name = "websocket-extensions-0.1.0";
+    self.by-version."websocket-driver"."0.5.3";
+  by-spec."websocket-extensions".">=0.1.1" =
+    self.by-version."websocket-extensions"."0.1.1";
+  by-version."websocket-extensions"."0.1.1" = self.buildNodePackage {
+    name = "websocket-extensions-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz";
-      name = "websocket-extensions-0.1.0.tgz";
-      sha1 = "43567457158085e83ce7050f17ac6d988936320a";
+      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
+      name = "websocket-extensions-0.1.1.tgz";
+      sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."when"."3.7.2" =
+    self.by-version."when"."3.7.2";
+  by-version."when"."3.7.2" = self.buildNodePackage {
+    name = "when-3.7.2";
+    version = "3.7.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/when/-/when-3.7.2.tgz";
+      name = "when-3.7.2.tgz";
+      sha1 = "06bed1296df3a0bfd83f7f31c5e1d779bd97eae8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."when"."~3.4.6" =
     self.by-version."when"."3.4.6";
   by-version."when"."3.4.6" = self.buildNodePackage {
     name = "when-3.4.6";
+    version = "3.4.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
@@ -30677,12 +40707,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."which"."1" =
     self.by-version."which"."1.0.8";
   by-version."which"."1.0.8" = self.buildNodePackage {
     name = "which-1.0.8";
+    version = "1.0.8";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz";
@@ -30691,7 +40726,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."which"."1.0.x" =
     self.by-version."which"."1.0.8";
@@ -30701,10 +40740,31 @@
     self.by-version."which"."1.0.8";
   by-spec."which"."~1.0.8" =
     self.by-version."which"."1.0.8";
+  by-spec."win-detect-browsers"."^0.0.2" =
+    self.by-version."win-detect-browsers"."0.0.2";
+  by-version."win-detect-browsers"."0.0.2" = self.buildNodePackage {
+    name = "win-detect-browsers-0.0.2";
+    version = "0.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-0.0.2.tgz";
+      name = "win-detect-browsers-0.0.2.tgz";
+      sha1 = "d636ade6434c9967c7e7af592a0b4aa2ba9d22f2";
+    };
+    deps = {
+      "which-1.0.8" = self.by-version."which"."1.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."win-release"."^1.0.0" =
     self.by-version."win-release"."1.0.0";
   by-version."win-release"."1.0.0" = self.buildNodePackage {
     name = "win-release-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz";
@@ -30713,12 +40773,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."win-trash"."^1.0.0" =
     self.by-version."win-trash"."1.0.0";
   by-version."win-trash"."1.0.0" = self.buildNodePackage {
     name = "win-trash-1.0.0";
+    version = "1.0.0";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/win-trash/-/win-trash-1.0.0.tgz";
@@ -30727,12 +40792,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."windows-no-runnable"."~0.0.6" =
     self.by-version."windows-no-runnable"."0.0.6";
   by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
     name = "windows-no-runnable-0.0.6";
+    version = "0.0.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz";
@@ -30741,12 +40811,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winser"."=0.1.6" =
     self.by-version."winser"."0.1.6";
   by-version."winser"."0.1.6" = self.buildNodePackage {
     name = "winser-0.1.6";
+    version = "0.1.6";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
@@ -30757,12 +40832,17 @@
       "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
       "commander-1.3.1" = self.by-version."commander"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."*" =
     self.by-version."winston"."0.9.0";
   by-version."winston"."0.9.0" = self.buildNodePackage {
     name = "winston-0.9.0";
+    version = "0.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz";
@@ -30778,13 +40858,18 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "winston" = self.by-version."winston"."0.9.0";
   by-spec."winston"."0.5.1" =
     self.by-version."winston"."0.5.1";
   by-version."winston"."0.5.1" = self.buildNodePackage {
     name = "winston-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.5.1.tgz";
@@ -30799,12 +40884,17 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.6.2" =
     self.by-version."winston"."0.6.2";
   by-version."winston"."0.6.2" = self.buildNodePackage {
     name = "winston-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
@@ -30820,7 +40910,11 @@
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.6.x" =
     self.by-version."winston"."0.6.2";
@@ -30828,6 +40922,7 @@
     self.by-version."winston"."0.7.2";
   by-version."winston"."0.7.2" = self.buildNodePackage {
     name = "winston-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
@@ -30843,12 +40938,17 @@
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.7.3" =
     self.by-version."winston"."0.7.3";
   by-version."winston"."0.7.3" = self.buildNodePackage {
     name = "winston-0.7.3";
+    version = "0.7.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
@@ -30864,12 +40964,17 @@
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.8.0" =
     self.by-version."winston"."0.8.0";
   by-version."winston"."0.8.0" = self.buildNodePackage {
     name = "winston-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
@@ -30884,12 +40989,17 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.8.x" =
     self.by-version."winston"."0.8.3";
   by-version."winston"."0.8.3" = self.buildNodePackage {
     name = "winston-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
@@ -30905,7 +41015,11 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."~0.8.1" =
     self.by-version."winston"."0.8.3";
@@ -30915,6 +41029,7 @@
     self.by-version."with"."1.1.1";
   by-version."with"."1.1.1" = self.buildNodePackage {
     name = "with-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
@@ -30924,12 +41039,17 @@
     deps = {
       "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."with"."~2.0.0" =
     self.by-version."with"."2.0.0";
   by-version."with"."2.0.0" = self.buildNodePackage {
     name = "with-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
@@ -30939,12 +41059,17 @@
     deps = {
       "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."with"."~4.0.0" =
     self.by-version."with"."4.0.1";
   by-version."with"."4.0.1" = self.buildNodePackage {
     name = "with-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/with/-/with-4.0.1.tgz";
@@ -30955,12 +41080,17 @@
       "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
       "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wordwrap"."0.0.x" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = self.buildNodePackage {
     name = "wordwrap-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
@@ -30969,7 +41099,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wordwrap".">=0.0.1 <0.1.0" =
     self.by-version."wordwrap"."0.0.2";
@@ -30979,6 +41113,7 @@
     self.by-version."wrap-fn"."0.1.4";
   by-version."wrap-fn"."0.1.4" = self.buildNodePackage {
     name = "wrap-fn-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.4.tgz";
@@ -30988,12 +41123,17 @@
     deps = {
       "co-3.1.0" = self.by-version."co"."3.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wrappy"."1" =
     self.by-version."wrappy"."1.0.1";
   by-version."wrappy"."1.0.1" = self.buildNodePackage {
     name = "wrappy-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
@@ -31002,14 +41142,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wrappy"."~1.0.1" =
     self.by-version."wrappy"."1.0.1";
-  by-spec."wrench"."~1.5.0" =
+  by-spec."wrench"."~1.5.4" =
     self.by-version."wrench"."1.5.8";
   by-version."wrench"."1.5.8" = self.buildNodePackage {
     name = "wrench-1.5.8";
+    version = "1.5.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
@@ -31018,14 +41163,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."wrench"."~1.5.4" =
+  by-spec."wrench"."~1.5.8" =
     self.by-version."wrench"."1.5.8";
   by-spec."write-file-atomic"."~1.1.0" =
     self.by-version."write-file-atomic"."1.1.0";
   by-version."write-file-atomic"."1.1.0" = self.buildNodePackage {
     name = "write-file-atomic-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz";
@@ -31036,12 +41186,17 @@
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ws"."0.4.31" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = self.buildNodePackage {
     name = "ws-0.4.31";
+    version = "0.4.31";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
@@ -31054,12 +41209,17 @@
       "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
       "options-0.0.6" = self.by-version."options"."0.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.32";
   by-version."ws"."0.4.32" = self.buildNodePackage {
     name = "ws-0.4.32";
+    version = "0.4.32";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
@@ -31072,14 +41232,17 @@
       "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
       "options-0.0.6" = self.by-version."options"."0.0.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."ws"."~0.4.31" =
-    self.by-version."ws"."0.4.32";
-  by-spec."ws"."~0.7.1" =
+  by-spec."ws"."0.7.1" =
     self.by-version."ws"."0.7.1";
   by-version."ws"."0.7.1" = self.buildNodePackage {
     name = "ws-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz";
@@ -31089,15 +41252,24 @@
     deps = {
       "options-0.0.6" = self.by-version."options"."0.0.6";
       "ultron-1.0.1" = self.by-version."ultron"."1.0.1";
+    };
+    optionalDependencies = {
       "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1";
       "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1";
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."ws"."~0.4.31" =
+    self.by-version."ws"."0.4.32";
+  by-spec."ws"."~0.7.1" =
+    self.by-version."ws"."0.7.1";
   by-spec."wu"."*" =
     self.by-version."wu"."2.0.0";
   by-version."wu"."2.0.0" = self.buildNodePackage {
     name = "wu-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
@@ -31107,13 +41279,38 @@
     deps = {
       "traceur-0.0.55" = self.by-version."traceur"."0.0.55";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "wu" = self.by-version."wu"."2.0.0";
+  by-spec."x-default-browser"."0.3.0" =
+    self.by-version."x-default-browser"."0.3.0";
+  by-version."x-default-browser"."0.3.0" = self.buildNodePackage {
+    name = "x-default-browser-0.3.0";
+    version = "0.3.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.0.tgz";
+      name = "x-default-browser-0.3.0.tgz";
+      sha1 = "850d5137bc97b78176e69ae916417fe3d4e97d5d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "default-browser-id-1.0.2" = self.by-version."default-browser-id"."1.0.2";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."x509"."*" =
     self.by-version."x509"."0.1.4";
   by-version."x509"."0.1.4" = self.buildNodePackage {
     name = "x509-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz";
@@ -31123,13 +41320,18 @@
     deps = {
       "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "x509" = self.by-version."x509"."0.1.4";
   by-spec."xcode"."0.6.7" =
     self.by-version."xcode"."0.6.7";
   by-version."xcode"."0.6.7" = self.buildNodePackage {
     name = "xcode-0.6.7";
+    version = "0.6.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz";
@@ -31140,12 +41342,17 @@
       "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xdg-basedir"."^1.0.0" =
     self.by-version."xdg-basedir"."1.0.1";
   by-version."xdg-basedir"."1.0.1" = self.buildNodePackage {
     name = "xdg-basedir-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz";
@@ -31155,12 +41362,17 @@
     deps = {
       "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xdg-empty-trash"."^1.0.0" =
     self.by-version."xdg-empty-trash"."1.0.0";
   by-version."xdg-empty-trash"."1.0.0" = self.buildNodePackage {
     name = "xdg-empty-trash-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz";
@@ -31171,12 +41383,17 @@
       "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xdg-trash"."^1.0.0" =
     self.by-version."xdg-trash"."1.0.6";
   by-version."xdg-trash"."1.0.6" = self.buildNodePackage {
     name = "xdg-trash-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.6.tgz";
@@ -31189,12 +41406,17 @@
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
       "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xdg-trashdir"."^1.0.0" =
     self.by-version."xdg-trashdir"."1.1.1";
   by-version."xdg-trashdir"."1.1.1" = self.buildNodePackage {
     name = "xdg-trashdir-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.1.1.tgz";
@@ -31206,12 +41428,17 @@
       "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
       "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xhr2".">= 0.0.5" =
     self.by-version."xhr2"."0.1.2";
   by-version."xhr2"."0.1.2" = self.buildNodePackage {
     name = "xhr2-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.2.tgz";
@@ -31220,12 +41447,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml"."^1.0.0" =
     self.by-version."xml"."1.0.0";
   by-version."xml"."1.0.0" = self.buildNodePackage {
     name = "xml-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml/-/xml-1.0.0.tgz";
@@ -31234,12 +41466,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml2js"."*" =
     self.by-version."xml2js"."0.4.5";
   by-version."xml2js"."0.4.5" = self.buildNodePackage {
     name = "xml2js-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.5.tgz";
@@ -31248,14 +41485,19 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2";
+      "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml2js"."0.2.4" =
     self.by-version."xml2js"."0.2.4";
   by-version."xml2js"."0.2.4" = self.buildNodePackage {
     name = "xml2js-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
@@ -31265,12 +41507,17 @@
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml2js"."0.2.6" =
     self.by-version."xml2js"."0.2.6";
   by-version."xml2js"."0.2.6" = self.buildNodePackage {
     name = "xml2js-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
@@ -31280,12 +41527,17 @@
     deps = {
       "sax-0.4.2" = self.by-version."sax"."0.4.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml2js"."0.4.4" =
     self.by-version."xml2js"."0.4.4";
   by-version."xml2js"."0.4.4" = self.buildNodePackage {
     name = "xml2js-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
@@ -31294,9 +41546,13 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2";
+      "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xml2js".">= 0.0.1" =
     self.by-version."xml2js"."0.4.5";
@@ -31305,9 +41561,30 @@
   by-spec."xml2js"."^0.4.4" =
     self.by-version."xml2js"."0.4.5";
   by-spec."xml2json".">=0.3.2" =
+    self.by-version."xml2json"."0.6.1";
+  by-version."xml2json"."0.6.1" = self.buildNodePackage {
+    name = "xml2json-0.6.1";
+    version = "0.6.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2json/-/xml2json-0.6.1.tgz";
+      name = "xml2json-0.6.1.tgz";
+      sha1 = "43883d09e4369f96b83316df833cf1fc20d6c3f1";
+    };
+    deps = {
+      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xml2json"."^0.5.1" =
     self.by-version."xml2json"."0.5.1";
   by-version."xml2json"."0.5.1" = self.buildNodePackage {
     name = "xml2json-0.5.1";
+    version = "0.5.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/xml2json/-/xml2json-0.5.1.tgz";
@@ -31317,14 +41594,17 @@
     deps = {
       "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."xml2json"."^0.5.1" =
-    self.by-version."xml2json"."0.5.1";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = self.buildNodePackage {
     name = "xmlbuilder-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
@@ -31333,12 +41613,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmlbuilder"."0.4.x" =
     self.by-version."xmlbuilder"."0.4.3";
   by-version."xmlbuilder"."0.4.3" = self.buildNodePackage {
     name = "xmlbuilder-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
@@ -31347,12 +41632,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmlbuilder"."2.2.1" =
     self.by-version."xmlbuilder"."2.2.1";
   by-version."xmlbuilder"."2.2.1" = self.buildNodePackage {
     name = "xmlbuilder-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
@@ -31362,27 +41652,37 @@
     deps = {
       "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmlbuilder".">=1.0.0" =
-    self.by-version."xmlbuilder"."2.5.2";
-  by-version."xmlbuilder"."2.5.2" = self.buildNodePackage {
-    name = "xmlbuilder-2.5.2";
+    self.by-version."xmlbuilder"."2.6.1";
+  by-version."xmlbuilder"."2.6.1" = self.buildNodePackage {
+    name = "xmlbuilder-2.6.1";
+    version = "2.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz";
-      name = "xmlbuilder-2.5.2.tgz";
-      sha1 = "5ab88fc508ab2ff14873010b56163d3f92b19325";
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.1.tgz";
+      name = "xmlbuilder-2.6.1.tgz";
+      sha1 = "ba6921650133e5808288f35dcab0db696a9ba9a0";
     };
     deps = {
-      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmldom"."0.1.x" =
     self.by-version."xmldom"."0.1.19";
   by-version."xmldom"."0.1.19" = self.buildNodePackage {
     name = "xmldom-0.1.19";
+    version = "0.1.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
@@ -31391,14 +41691,19 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."xmldom"."~0.1.16" =
+  by-spec."xmldom"."~0.1.19" =
     self.by-version."xmldom"."0.1.19";
   by-spec."xmlhttprequest"."1.4.2" =
     self.by-version."xmlhttprequest"."1.4.2";
   by-version."xmlhttprequest"."1.4.2" = self.buildNodePackage {
     name = "xmlhttprequest-1.4.2";
+    version = "1.4.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
@@ -31407,12 +41712,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmlhttprequest".">=1.5.0" =
     self.by-version."xmlhttprequest"."1.7.0";
   by-version."xmlhttprequest"."1.7.0" = self.buildNodePackage {
     name = "xmlhttprequest-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.7.0.tgz";
@@ -31421,12 +41731,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xmlhttprequest"."https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" =
     self.by-version."xmlhttprequest"."1.5.0";
   by-version."xmlhttprequest"."1.5.0" = self.buildNodePackage {
     name = "xmlhttprequest-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
       url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz";
@@ -31435,12 +41750,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = self.buildNodePackage {
     name = "xoauth2-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
@@ -31449,12 +41769,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xregexp"."2.0.0" =
     self.by-version."xregexp"."2.0.0";
   by-version."xregexp"."2.0.0" = self.buildNodePackage {
     name = "xregexp-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz";
@@ -31463,12 +41788,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xtend".">=4.0.0 <4.1.0-0" =
     self.by-version."xtend"."4.0.0";
   by-version."xtend"."4.0.0" = self.buildNodePackage {
     name = "xtend-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
@@ -31477,12 +41807,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xtend"."^3.0.0" =
     self.by-version."xtend"."3.0.0";
   by-version."xtend"."3.0.0" = self.buildNodePackage {
     name = "xtend-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
@@ -31491,7 +41826,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xtend"."^4.0.0" =
     self.by-version."xtend"."4.0.0";
@@ -31499,6 +41838,7 @@
     self.by-version."xtend"."2.1.2";
   by-version."xtend"."2.1.2" = self.buildNodePackage {
     name = "xtend-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
@@ -31508,7 +41848,11 @@
     deps = {
       "object-keys-0.4.0" = self.by-version."object-keys"."0.4.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."xtend"."~3.0.0" =
     self.by-version."xtend"."3.0.0";
@@ -31516,6 +41860,7 @@
     self.by-version."xtraverse"."0.1.0";
   by-version."xtraverse"."0.1.0" = self.buildNodePackage {
     name = "xtraverse-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz";
@@ -31525,12 +41870,17 @@
     deps = {
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."yamlish"."*" =
     self.by-version."yamlish"."0.0.6";
   by-version."yamlish"."0.0.6" = self.buildNodePackage {
     name = "yamlish-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz";
@@ -31539,12 +41889,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."yargs"."^1.2.1" =
     self.by-version."yargs"."1.3.3";
   by-version."yargs"."1.3.3" = self.buildNodePackage {
     name = "yargs-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
@@ -31553,14 +41908,21 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."yargs"."~1.3.1" =
     self.by-version."yargs"."1.3.3";
+  by-spec."yargs"."~1.3.2" =
+    self.by-version."yargs"."1.3.3";
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = self.buildNodePackage {
     name = "zeparser-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
@@ -31569,12 +41931,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."zip-stream"."~0.4.0" =
     self.by-version."zip-stream"."0.4.1";
   by-version."zip-stream"."0.4.1" = self.buildNodePackage {
     name = "zip-stream-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz";
@@ -31586,12 +41953,17 @@
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."zlib-browserify"."~0.0.3" =
     self.by-version."zlib-browserify"."0.0.3";
   by-version."zlib-browserify"."0.0.3" = self.buildNodePackage {
     name = "zlib-browserify-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
@@ -31601,6 +41973,10 @@
     deps = {
       "tape-0.2.2" = self.by-version."tape"."0.2.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index f942295dff7d..4c8e5bbcd886 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -26,17 +26,15 @@
 , "temp"
 , "faye-websocket"
 , "node-uuid"
-, "rbytes"
 , "sockjs"
 , "backbone"
 , "browserchannel"
 , "node-gyp"
 , "semver"
-, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.10.3" }
+, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.11.0" }
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
-, "stream-splitter-transform"
 , "bcrypt"
 , "nconf"
 , "winston"
@@ -59,7 +57,6 @@
 , "should"
 , "nodemon"
 , "timezone"
-, "libyaml"
 , "i18next"
 , "stylus"
 , "nib"
@@ -85,6 +82,7 @@
 , "grunt-karma"
 , "grunt-sed"
 , "gulp"
+, "webpack"
 , "karma"
 , "karma-mocha"
 , "karma-coverage"
@@ -139,10 +137,8 @@
 , "node-xmpp-server"
 , "node-xmpp-serviceadmin"
 , "node-xmpp-joap"
-, "plc"
 , "7f"
 , "jfs"
-, "toobusy"
 , "cordova"
 , "sloc"
 , "peerflix"
@@ -194,4 +190,6 @@
 , "bip-pod-github"
 , "bip-pod-google-drive"
 , "bip-pod-github"
+, "sleep"
+, "node-red"
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index a0cbd5c4a8b1..b418f59e33ce 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -17,22 +17,53 @@
 
 with stdenv.lib;
 
-rec {
+let
+  removeDeps = remove: deps: filterAttrs (n: d: all (r: r != d.pkgName) remove) deps;
+  replaceDep = replace: deps: mapAttrs (n: d: if d.pkgName == replace.pkgName then replace else d) deps;
+in rec {
   overrides = {
     phantomjs.buildInputs = [ pkgs.phantomjs ];
     "node-expat".buildInputs = [ pkgs.expat ];
     "node-stringprep".buildInputs = [ pkgs.icu pkgs.which ];
     "node-protobuf".buildInputs = [ pkgs.protobuf ];
-    "rbytes".buildInputs = [ pkgs.openssl ];
 
-    bipio.patchPhase = ''
-      ${self.json}/bin/json -I -f package.json -e 'this.scripts.install=""'
+    "tap-0.3.3".patchPhase = ''
+      substituteInPlace package.json --replace '"tap-consumer",' ""
     '';
+    "node-uptime" = (p: {
+      # Net-ping is not really used
+      patchPhase = ''
+        ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies["net-ping"]'
+      '';
+      deps = removeDeps ["net-ping"] p.deps;
+    });
+    bipio = (p: {
+      patchPhase = ''
+        substituteInPlace src/bootstrap.js --replace "memwatch = require('memwatch')," ""
+        ${self.json}/bin/json -I -f package.json -e 'this.scripts.install=""'
+        ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies.sleep'
+        ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies.memwatch'
+        ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies["webkit-devtools-agent"]'
+      '';
+      deps = replaceDep self.sleep (removeDeps ["memwatch" "webkit-devtools-agent"] p.deps);
+    });
     bip-pod.patchPhase = ''
       substituteInPlace index.js --replace \
         "__dirname + (literal ? '/' : '/../bip-pod-') + podName" \
         "(literal ? __dirname + '/' : \"bip-pod-\") + podName"
     '';
+    webdrvr.preBuild = ''
+      mkdir ../webdrvr
+      ln -s ${pkgs.fetchurl {
+        url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
+        sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
+      }} ../webdrvr/selenium-server-standalone-2.43.1.jar
+      ln -s ${pkgs.fetchurl {
+        url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
+        sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
+      }} ../webdrvr/chromedriver_linux64.zip
+    '';
+    statsd.skipOptionalDependencies = ["hashring" "node-syslog"];
   } // args.overrides or {};
 
   # Apply overrides and back compatiblity transformations
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e996d35b80e4..2b3afb094122 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -101,7 +101,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
       sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl";
     };
-    propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ];
+    propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
   };
 
   AnyEvent = buildPerlPackage {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c262470400c..092a61c3b9a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -126,6 +126,8 @@ let
 
   pitz = callPackage ../applications/misc/pitz { };
 
+  plantuml = callPackage ../tools/misc/plantuml { };
+
   pycairo = callPackage ../development/python-modules/pycairo {
   };
 
@@ -2142,6 +2144,26 @@ let
     };
   });
 
+  ddar = buildPythonPackage {
+    name = "ddar-1.0";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/basak/ddar/archive/v1.0.tar.gz";
+      sha256 = "08lv7hrbhcv6hbl01sx8fgx3l8s2nn8rvcicdidafwm87bvi2nmr";
+    };
+
+    preBuild = ''
+      make -f Makefile.prep synctus/ddar_pb2.py
+    '';
+
+    propagatedBuildInputs = with self; [ protobuf modules.sqlite3 ];
+
+    meta = {
+      description = "Unix de-duplicating archiver";
+      license = licenses.gpl3;
+      homepage = https://github.com/basak/ddar;
+    };
+  };
 
   decorator = buildPythonPackage rec {
     name = "decorator-3.4.0";
@@ -3022,6 +3044,23 @@ let
     };
   };
 
+  passlib = buildPythonPackage rec {
+    version = "1.6.2";
+    name    = "passlib-${version}";
+
+    src = pkgs.fetchurl {
+      url    = "https://pypi.python.org/packages/source/p/passlib/passlib-${version}.tar.gz";
+      md5    = "2f872ae7c72ca338634c618f2cff5863";
+    };
+
+    buildInputs = with self; [ nose pybcrypt];
+
+    meta = with stdenv.lib; {
+      description = "A password hashing library for Python";
+      homepage    = https://code.google.com/p/passlib/;
+    };
+  };
+
 
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.4";
@@ -3401,6 +3440,16 @@ let
     };
   };
 
+  py3status = buildPythonPackage rec {
+    name = "py3status-2.3";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz";
+      md5 = "89ad395268c7791ff5d36412b1efeeb9";
+    };
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+    };
+  };
 
   pyramid_zodbconn = buildPythonPackage rec {
     name = "pyramid_zodbconn-0.7";
@@ -9037,11 +9086,11 @@ let
 
 
   requests2 = buildPythonPackage rec {
-    name = "requests-2.4.3";
+    name = "requests-2.5.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
-      md5 = "02214b3a179e445545de4b7a98d3dd17";
+      sha256 = "0rnyg6164jp7x7slgwnhigqza18d705hdvzwr4yk5qmisgpkaxvv";
     };
 
     meta = {
@@ -10290,11 +10339,18 @@ let
 
 
   sphinxcontrib_httpdomain = buildPythonPackage (rec {
-    name = "sphinxcontrib-httpdomain-1.1.9";
+    name = "sphinxcontrib-httpdomain-1.3.0";
+
+    # See issue #6548
+    disabled = isPyPy;
+
+    # Check is disabled due to this issue:
+    # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype
+    doCheck = false;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz";
-      md5 = "0f63aea612cc9e0b55a6c39e5b0f87b7";
+      md5 = "ad7ea42bd4c7c0ee57b1cb25bbf24aab";
     };
 
     propagatedBuildInputs = with self; [sphinx];
@@ -10309,6 +10365,29 @@ let
   });
 
 
+  sphinxcontrib_plantuml = buildPythonPackage (rec {
+    name = "sphinxcontrib-plantuml-0.5";
+
+    # See issue #6548
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz";
+      md5 = "4a8840fe3475a19c2af3fa877ab9d296";
+    };
+
+    propagatedBuildInputs = with self; [sphinx plantuml];
+
+    meta = {
+      description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
+
+      homepage = http://bitbucket.org/birkenfeld/sphinx-contrib;
+
+      license = "BSD";
+    };
+  });
+
+
   sphinx_pypi_upload = buildPythonPackage (rec {
     name = "Sphinx-PyPI-upload-0.2.1";
 
@@ -12991,18 +13070,18 @@ let
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.9";
+    version = "1.2.12";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "1vbrkwvsvcfgibdw4drcypg2n6zcpi3zv23zw20nkk5fjfp26w4g";
+      sha256 = "17w4mpsp4pxhbzs128ig3gxp12rr0j41mxch8i11dqjrjy7l6bs3";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];
 
-    buildPhase = "python setup.py build";
+    buildPhase = "${python.interpreter} setup.py build";
 
-    installPhase = "python setup.py install --prefix=$out";
+    installPhase = "${python.interpreter} setup.py install --prefix=$out";
 
     meta = {
       homepage = http://www.libvirt.org/;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 47026336403a..11a6a6c9c5c6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -12,7 +12,7 @@
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" /* "x86_64-darwin" */ ]
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
@@ -23,6 +23,7 @@ let
     { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
 
       manual = import ../../doc;
+      lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
 
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
@@ -30,6 +31,7 @@ let
           constituents =
             [ jobs.tarball
               jobs.manual
+              jobs.lib.tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin
@@ -349,12 +351,6 @@ let
       linuxPackages_grsec_testing_server = { };
       linuxPackages_grsec_testing_server_xen = { };
 
-    } ))
-
-    # Temporary hack: build some stuff on Darwin.
-    // (with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; mapTestOn {
-      stdenv = all;
-      hello = all;
-    });
+    } ));
 
 in jobs