summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/cool-retro-term/default.nix2
-rw-r--r--pkgs/applications/misc/dbvisualizer/default.nix25
-rw-r--r--pkgs/applications/misc/kdbplus/default.nix75
-rw-r--r--pkgs/applications/misc/keepass/default.nix4
-rw-r--r--pkgs/applications/misc/keybase/default.nix (renamed from pkgs/applications/misc/keybase-node-client/default.nix)8
-rw-r--r--pkgs/applications/misc/keybase/package.nix (renamed from pkgs/applications/misc/keybase-node-client/package.nix)1670
-rw-r--r--pkgs/applications/misc/librecad/2.0.nix8
-rw-r--r--pkgs/applications/misc/mediainfo-gui/default.nix4
-rw-r--r--pkgs/applications/misc/mediainfo/default.nix4
-rw-r--r--pkgs/applications/misc/mupdf/default.nix5
-rw-r--r--pkgs/applications/misc/ocropus/default.nix57
-rw-r--r--pkgs/applications/misc/ocropus/display.patch17
-rw-r--r--pkgs/applications/misc/ranger/default.nix10
-rw-r--r--pkgs/applications/misc/rescuetime/default.nix6
-rw-r--r--pkgs/applications/misc/rtv/default.nix27
-rw-r--r--pkgs/applications/misc/synergy/default.nix4
-rw-r--r--pkgs/applications/misc/vue/default.nix55
-rw-r--r--pkgs/applications/misc/xkblayout-state/default.nix5
-rw-r--r--pkgs/applications/misc/yate/default.nix25
20 files changed, 1624 insertions, 391 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d5a231ac7bd..991cc65c94d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.23.0";
+  name = "calibre-2.26.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0n99la1pacrw4ahb3wk0p68120p7j7v76mvpaf4qnkxy1vfdif7d";
+    sha256 = "0340cdxbdwvckmz3zygwx1wbn62wxap0545nsimpfq4ln7dcxrfw";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index bdc13f554b4..455d33860fb 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       eye-candy, customizable, and reasonably lightweight.
     '';
     homepage = "https://github.com/Swordifish90/cool-retro-term";
-    licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix
new file mode 100644
index 00000000000..fd6ed0866cb
--- /dev/null
+++ b/pkgs/applications/misc/dbvisualizer/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, jre, coreutils, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "dbvisualizer-9.2.5";
+
+  src = fetchurl {
+    url = https://www.dbvis.com/product_download/dbvis-9.2.5/media/dbvis_unix_9_2_5.tar.gz;
+    sha256 = "e9d3374e96cf63903ebd9dae498c6b69403813eb8723187ed70f285dd7119327";
+  };
+
+  buildInputs = [ makeWrapper ];
+  
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a . $out
+    ln -sf $out/dbvis $out/bin    
+    wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre}
+  '';
+  
+  meta = {
+    description = "The universal database tool";
+    homepage = https://www.dbvis.com/;
+    license = stdenv.lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
new file mode 100644
index 00000000000..ffde422c18b
--- /dev/null
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, requireFile, unzip, rlwrap, bash }:
+
+assert (stdenv.system == "i686-linux");
+
+let
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.libc stdenv.cc.cc ];
+in
+stdenv.mkDerivation rec {
+  name    = "kdbplus-${version}";
+  version = "3.2";
+
+  src = requireFile {
+    message = ''
+      Nix can't download kdb+ for you automatically. Go to
+      http://kx.com and download the free, 32-bit version for
+      Linux. Then run "nix-prefetch-url file:///linux.zip" in the
+      directory where you saved it. Note you need version 3.2.
+    '';
+    name   = "linux.zip";
+    sha256 = "0ah1kfvxnrck1kg8j7rpzgj6amji62zbm4ya6q55l54gm3qq6q0r";
+  };
+
+  dontStrip = true;
+  buildInputs = [ unzip ];
+
+  phases = "unpackPhase installPhase";
+  unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+
+    patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} \
+      ./q/l32/q
+    mv ./q/l32/q $out/libexec/q
+
+    # Shell script wrappers to make things more convenient...
+
+    cat > $out/bin/q-install <<- EOF
+    #!${bash}/bin/bash
+    if [ -f \$HOME/q/q.k ]; then
+      echo "kdb has already been unpacked in \$HOME. Skipping..."
+      exit 0
+    fi
+    echo -n "Unzipping ${src} into \$HOME... "
+    cd \$HOME && ${unzip}/bin/unzip -qq ${src}
+    echo "Done"
+    EOF
+
+    cat > $out/bin/q <<- EOF
+    #!${bash}/bin/bash
+    if [ ! -f \$HOME/q/q.k ]; then
+      echo "ERROR: You need to unzip the Q sources into \$HOME before running q."
+      echo
+      echo "Try:"
+      echo "  cd \$HOME && unzip ${src}"
+      echo "(or run q-install)"
+      exit 1
+    fi
+
+    exec ${rlwrap}/bin/rlwrap $out/libexec/q \$@
+    EOF
+
+    chmod +x $out/bin/q $out/bin/q-install
+  '';
+
+  meta = {
+    description = "Analytics and time-series database";
+    homepage    = "http://www.kx.com/";
+    license     = stdenv.lib.licenses.unfree;
+    platforms   = [ "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index e47e87d6338..d46efc4e5e8 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keepass-${version}";
-  version = "2.28";
+  version = "2.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}.zip";
-    sha256 = "0rlll6qriflaibqpw9qqfgqqr7cvhl404c3ph6n2i22j7xn5mizh";
+    sha256 = "16x7m899akpi036c0wlr41w7fz9q0b69yac9q97rqkixb03l4g9d";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase/default.nix
index 048b42159b8..fb1c492b48e 100644
--- a/pkgs/applications/misc/keybase-node-client/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -3,19 +3,19 @@
 with stdenv.lib;
 
 let 
-  nodePackages = callPackage (import <nixpkgs/pkgs/top-level/node-packages.nix>) {
+  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
     neededNatives = [] ++ optional (stdenv.isLinux) utillinux;
     self = nodePackages;
     generated = ./package.nix;
   };
 
 in nodePackages.buildNodePackage rec {
-  name = "keybase-node-client-${version}";
-  version = "0.7.7";
+  name = "keybase-${version}";
+  version = "0.7.8";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1p2plxz4lf5pbrvl5sql00lk459lnxcz7cxc4cdhfzc6h4ql425f";
+    sha256 = "1ak27bd7jwyss85i7plnfr5al33ykfifqknncyx1ir2r2ldagzc7";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase/package.nix
index 2835fe81b98..ee004a0ac67 100644
--- a/pkgs/applications/misc/keybase-node-client/package.nix
+++ b/pkgs/applications/misc/keybase/package.nix
@@ -5,6 +5,7 @@
     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";
@@ -15,12 +16,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";
@@ -29,12 +35,57 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.0.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.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.1";
+  by-spec."ansi-styles"."^2.0.1" =
+    self.by-version."ansi-styles"."2.0.1";
+  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
+    name = "ansi-styles-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
+      name = "ansi-styles-2.0.1.tgz";
+      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+    };
+    deps = {
+    };
+    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";
@@ -45,13 +96,18 @@
       "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 = [ ];
   };
   "argparse" = self.by-version."argparse"."0.1.15";
   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";
@@ -60,12 +116,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";
@@ -74,12 +135,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";
@@ -88,12 +154,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."~0.9.0" =
     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";
@@ -102,12 +173,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";
@@ -116,12 +192,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."badnode"."^1.0.1" =
     self.by-version."badnode"."1.0.1";
   by-version."badnode"."1.0.1" = self.buildNodePackage {
     name = "badnode-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/badnode/-/badnode-1.0.1.tgz";
@@ -129,15 +210,20 @@
       sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0";
     };
     deps = {
-      "semver-4.3.1" = self.by-version."semver"."4.3.1";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "badnode" = self.by-version."badnode"."1.0.1";
   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";
@@ -146,12 +232,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bitcoyne".">=0.0.6" =
     self.by-version."bitcoyne"."1.0.1";
   by-version."bitcoyne"."1.0.1" = self.buildNodePackage {
     name = "bitcoyne-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-1.0.1.tgz";
@@ -161,16 +252,60 @@
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.8" = self.by-version."kbpgp"."2.0.8";
+      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
       "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bitcoyne" = self.by-version."bitcoyne"."1.0.1";
+  by-spec."bl"."~0.9.0" =
+    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";
+      name = "bl-0.9.4.tgz";
+      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.9.21" =
+    self.by-version."bluebird"."2.9.24";
+  by-version."bluebird"."2.9.24" = self.buildNodePackage {
+    name = "bluebird-2.9.24";
+    version = "2.9.24";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
+      name = "bluebird-2.9.24.tgz";
+      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bn"."^1.0.0" =
     self.by-version."bn"."1.0.1";
   by-version."bn"."1.0.1" = self.buildNodePackage {
     name = "bn-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz";
@@ -179,30 +314,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bn"."^1.0.1" =
     self.by-version."bn"."1.0.1";
   "bn" = self.by-version."bn"."1.0.1";
-  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";
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.7.1";
+  by-version."boom"."2.7.1" = self.buildNodePackage {
+    name = "boom-2.7.1";
+    version = "2.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-      name = "boom-0.4.2.tgz";
-      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
+      name = "boom-2.7.1.tgz";
+      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+    };
+    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";
@@ -213,12 +358,60 @@
       "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."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";
+      name = "caseless-0.9.0.tgz";
+      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.0.0";
+  by-version."chalk"."1.0.0" = self.buildNodePackage {
+    name = "chalk-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      name = "chalk-1.0.0.tgz";
+      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+    };
+    deps = {
+      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cheerio"."0.13.0" =
     self.by-version."cheerio"."0.13.0";
   by-version."cheerio"."0.13.0" = self.buildNodePackage {
     name = "cheerio-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz";
@@ -231,13 +424,18 @@
       "entities-0.5.0" = self.by-version."entities"."0.5.0";
       "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "cheerio" = self.by-version."cheerio"."0.13.0";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = self.buildNodePackage {
     name = "cli-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
@@ -245,14 +443,19 @@
       sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
     };
     deps = {
-      "glob-5.0.0" = self.by-version."glob"."5.0.0";
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cliff"."0.1.x" =
     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";
@@ -264,12 +467,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."codesign"."0.0.9" =
     self.by-version."codesign"."0.0.9";
   by-version."codesign"."0.0.9" = self.buildNodePackage {
     name = "codesign-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz";
@@ -283,13 +491,18 @@
       "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2";
       "tablify-0.1.5" = self.by-version."tablify"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "codesign" = self.by-version."codesign"."0.0.9";
   by-spec."colors"."0.6.2" =
     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";
@@ -298,7 +511,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "colors" = self.by-version."colors"."0.6.2";
   by-spec."colors"."0.6.x" =
@@ -307,6 +524,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";
@@ -315,7 +533,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
@@ -325,6 +547,7 @@
     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";
@@ -334,26 +557,41 @@
     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";
   by-spec."commander".">= 0.5.2" =
-    self.by-version."commander"."2.6.0";
-  by-version."commander"."2.6.0" = self.buildNodePackage {
-    name = "commander-2.6.0";
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-      name = "commander-2.6.0.tgz";
-      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
     };
     deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."commander"."^2.7.1" =
+    self.by-version."commander"."2.8.1";
   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";
@@ -362,12 +600,17 @@
     };
     deps = {
     };
+    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";
@@ -376,12 +619,17 @@
     };
     deps = {
     };
+    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";
@@ -390,27 +638,37 @@
     };
     deps = {
     };
+    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";
+  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-0.2.2.tgz";
-      name = "cryptiles-0.2.2.tgz";
-      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
+      name = "cryptiles-2.0.4.tgz";
+      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
     };
     deps = {
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+    };
+    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";
@@ -419,12 +677,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";
@@ -433,12 +696,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."0.2.1" =
     self.by-version."deep-equal"."0.2.1";
   by-version."deep-equal"."0.2.1" = self.buildNodePackage {
     name = "deep-equal-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
@@ -447,13 +715,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "deep-equal" = self.by-version."deep-equal"."0.2.1";
   by-spec."deep-equal".">=0.2.1" =
     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";
@@ -462,12 +735,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";
@@ -476,12 +754,17 @@
     };
     deps = {
     };
+    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";
@@ -490,12 +773,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."docco"."~0.6.2" =
     self.by-version."docco"."0.6.3";
   by-version."docco"."0.6.3" = self.buildNodePackage {
     name = "docco-0.6.3";
+    version = "0.6.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz";
@@ -503,18 +791,23 @@
       sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee";
     };
     deps = {
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
       "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "fs-extra-0.16.4" = self.by-version."fs-extra"."0.16.4";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
-      "highlight.js-8.4.0" = self.by-version."highlight.js"."8.4.0";
+      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.3.0";
   by-version."domelementtype"."1.3.0" = self.buildNodePackage {
     name = "domelementtype-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
@@ -523,12 +816,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domhandler"."2.2" =
     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";
@@ -538,12 +836,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domutils"."1.3" =
     self.by-version."domutils"."1.3.0";
   by-version."domutils"."1.3.0" = self.buildNodePackage {
     name = "domutils-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz";
@@ -553,12 +856,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    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";
@@ -568,12 +876,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.5.0";
   by-version."entities"."0.5.0" = self.buildNodePackage {
     name = "entities-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz";
@@ -582,12 +895,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."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."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";
@@ -596,45 +933,60 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eyes"."~0.1.8" =
     self.by-version."eyes"."0.1.8";
-  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";
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-      name = "forever-agent-0.5.2.tgz";
-      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.4";
-  by-version."form-data"."0.1.4" = self.buildNodePackage {
-    name = "form-data-0.1.4";
+  by-spec."form-data"."~0.2.0" =
+    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.1.4.tgz";
-      name = "form-data-0.1.4.tgz";
-      sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      name = "form-data-0.2.0.tgz";
+      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
     };
     deps = {
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."framed-msgpack-rpc"."1.1.4" =
     self.by-version."framed-msgpack-rpc"."1.1.4";
   by-version."framed-msgpack-rpc"."1.1.4" = self.buildNodePackage {
     name = "framed-msgpack-rpc-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz";
@@ -645,66 +997,145 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4";
   by-spec."fs-extra".">= 0.6.0" =
-    self.by-version."fs-extra"."0.16.4";
-  by-version."fs-extra"."0.16.4" = self.buildNodePackage {
-    name = "fs-extra-0.16.4";
+    self.by-version."fs-extra"."0.18.2";
+  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
+    name = "fs-extra-0.18.2";
+    version = "0.18.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.4.tgz";
-      name = "fs-extra-0.16.4.tgz";
-      sha1 = "3e3d3cd6f388e2acbc0fc2e0202f0533ec0507b1";
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
+      name = "fs-extra-0.18.2.tgz";
+      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.1" = self.by-version."rimraf"."2.3.1";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.1.1";
+  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
+    name = "generate-object-property-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
+      name = "generate-object-property-1.1.1.tgz";
+      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
+    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";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."5.0.0";
-  by-version."glob"."5.0.0" = self.buildNodePackage {
-    name = "glob-5.0.0";
+    self.by-version."glob"."5.0.5";
+  by-version."glob"."5.0.5" = self.buildNodePackage {
+    name = "glob-5.0.5";
+    version = "5.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-5.0.0.tgz";
-      name = "glob-5.0.0.tgz";
-      sha1 = "bb00d4e340932eb101dc2a30e4127ddd51ed15ed";
+      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
+      name = "glob-5.0.5.tgz";
+      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."^4.4.2" =
-    self.by-version."glob"."4.5.0";
-  by-version."glob"."4.5.0" = self.buildNodePackage {
-    name = "glob-4.5.0";
+    self.by-version."glob"."4.5.3";
+  by-version."glob"."4.5.3" = self.buildNodePackage {
+    name = "glob-4.5.3";
+    version = "4.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.5.0.tgz";
-      name = "glob-4.5.0.tgz";
-      sha1 = "d6511322e9d5c9bc689f20eb7348f00489723882";
+      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+      name = "glob-4.5.3.tgz";
+      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob-to-regexp".">=0.0.1" =
     self.by-version."glob-to-regexp"."0.0.2";
   by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage {
     name = "glob-to-regexp-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz";
@@ -713,17 +1144,22 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."gpg-wrapper".">=1.0.3" =
-    self.by-version."gpg-wrapper"."1.0.3";
-  by-version."gpg-wrapper"."1.0.3" = self.buildNodePackage {
-    name = "gpg-wrapper-1.0.3";
+  by-spec."gpg-wrapper".">=1.0.0" =
+    self.by-version."gpg-wrapper"."1.0.4";
+  by-version."gpg-wrapper"."1.0.4" = self.buildNodePackage {
+    name = "gpg-wrapper-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.3.tgz";
-      name = "gpg-wrapper-1.0.3.tgz";
-      sha1 = "826260e7ae53932f80574e04240bbb8999227cd1";
+      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.4.tgz";
+      name = "gpg-wrapper-1.0.4.tgz";
+      sha1 = "0f26586bb9408e5c47201a45661bac1093e0d0ff";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
@@ -733,73 +1169,163 @@
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "spotty-1.0.0" = self.by-version."spotty"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.3";
+  by-spec."gpg-wrapper".">=1.0.4" =
+    self.by-version."gpg-wrapper"."1.0.4";
+  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.4";
   by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-version."graceful-fs"."3.0.5" = self.buildNodePackage {
-    name = "graceful-fs-3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
+  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
+    name = "graceful-fs-3.0.6";
+    version = "3.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
+      name = "graceful-fs-3.0.6.tgz";
+      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
-      name = "graceful-fs-3.0.5.tgz";
-      sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418";
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.4.0" =
+    self.by-version."har-validator"."1.6.1";
+  by-version."har-validator"."1.6.1" = self.buildNodePackage {
+    name = "har-validator-1.6.1";
+    version = "1.6.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
+      name = "har-validator-1.6.1.tgz";
+      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
     };
     deps = {
+      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
+    };
+    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";
+  by-spec."has-ansi"."^1.0.3" =
+    self.by-version."has-ansi"."1.0.3";
+  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
+    name = "has-ansi-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      name = "has-ansi-1.0.3.tgz";
+      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+    };
+    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-1.0.0.tgz";
-      name = "hawk-1.0.0.tgz";
-      sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
+      name = "hawk-2.3.1.tgz";
+      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
-      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+      "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."highlight.js".">= 8.0.x" =
-    self.by-version."highlight.js"."8.4.0";
-  by-version."highlight.js"."8.4.0" = self.buildNodePackage {
-    name = "highlight.js-8.4.0";
+    self.by-version."highlight.js"."8.5.0";
+  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
+    name = "highlight.js-8.5.0";
+    version = "8.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.4.0.tgz";
-      name = "highlight.js-8.4.0.tgz";
-      sha1 = "dc0d05b8dc9b110f13bce52cb96fd1e0c6bc791c";
+      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
+      name = "highlight.js-8.5.0.tgz";
+      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
     };
     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";
+  by-spec."hoek"."2.x.x" =
+    self.by-version."hoek"."2.12.0";
+  by-version."hoek"."2.12.0" = self.buildNodePackage {
+    name = "hoek-2.12.0";
+    version = "2.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-      name = "hoek-0.9.1.tgz";
-      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
+      name = "hoek-2.12.0.tgz";
+      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."htmlparser2"."~3.4.0" =
     self.by-version."htmlparser2"."3.4.0";
   by-version."htmlparser2"."3.4.0" = self.buildNodePackage {
     name = "htmlparser2-3.4.0";
+    version = "3.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz";
@@ -812,12 +1338,17 @@
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    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";
@@ -829,12 +1360,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."iced-coffee-script"."~1.7.1-c" =
     self.by-version."iced-coffee-script"."1.7.1-g";
   by-version."iced-coffee-script"."1.7.1-g" = self.buildNodePackage {
     name = "iced-coffee-script-1.7.1-g";
+    version = "1.7.1-g";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz";
@@ -846,13 +1382,18 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-coffee-script" = self.by-version."iced-coffee-script"."1.7.1-g";
   by-spec."iced-data-structures"."0.0.5" =
     self.by-version."iced-data-structures"."0.0.5";
   by-version."iced-data-structures"."0.0.5" = self.buildNodePackage {
     name = "iced-data-structures-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz";
@@ -861,13 +1402,20 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-data-structures" = self.by-version."iced-data-structures"."0.0.5";
+  by-spec."iced-data-structures"."~0.0.5" =
+    self.by-version."iced-data-structures"."0.0.5";
   by-spec."iced-db"."0.0.4" =
     self.by-version."iced-db"."0.0.4";
   by-version."iced-db"."0.0.4" = self.buildNodePackage {
     name = "iced-db-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz";
@@ -879,13 +1427,18 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-db" = self.by-version."iced-db"."0.0.4";
   by-spec."iced-error"."0.0.9" =
     self.by-version."iced-error"."0.0.9";
   by-version."iced-error"."0.0.9" = self.buildNodePackage {
     name = "iced-error-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz";
@@ -894,7 +1447,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-error" = self.by-version."iced-error"."0.0.9";
   by-spec."iced-error".">=0.0.8" =
@@ -907,6 +1464,7 @@
     self.by-version."iced-expect"."0.0.3";
   by-version."iced-expect"."0.0.3" = self.buildNodePackage {
     name = "iced-expect-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz";
@@ -915,13 +1473,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-expect" = self.by-version."iced-expect"."0.0.3";
   by-spec."iced-lock"."^1.0.1" =
     self.by-version."iced-lock"."1.0.1";
   by-version."iced-lock"."1.0.1" = self.buildNodePackage {
     name = "iced-lock-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz";
@@ -931,13 +1494,18 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-lock" = self.by-version."iced-lock"."1.0.1";
   by-spec."iced-logger"."0.0.5" =
     self.by-version."iced-logger"."0.0.5";
   by-version."iced-logger"."0.0.5" = self.buildNodePackage {
     name = "iced-logger-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz";
@@ -947,13 +1515,18 @@
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-logger" = self.by-version."iced-logger"."0.0.5";
   by-spec."iced-logger".">=0.0.3" =
     self.by-version."iced-logger"."0.0.6";
   by-version."iced-logger"."0.0.6" = self.buildNodePackage {
     name = "iced-logger-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.6.tgz";
@@ -963,12 +1536,19 @@
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iced-logger"."~0.0.1" =
+    self.by-version."iced-logger"."0.0.6";
   by-spec."iced-runtime".">=0.0.1" =
     self.by-version."iced-runtime"."1.0.2";
   by-version."iced-runtime"."1.0.2" = self.buildNodePackage {
     name = "iced-runtime-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz";
@@ -977,7 +1557,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-runtime" = self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime".">=0.0.1 <2.0.0-0" =
@@ -988,10 +1572,11 @@
     self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime"."^1.0.2" =
     self.by-version."iced-runtime"."1.0.2";
-  by-spec."iced-spawn".">=0.0.8" =
+  by-spec."iced-spawn".">=0.0.3" =
     self.by-version."iced-spawn"."1.0.0";
   by-version."iced-spawn"."1.0.0" = self.buildNodePackage {
     name = "iced-spawn-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-1.0.0.tgz";
@@ -1000,10 +1585,16 @@
     };
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "semver-4.3.1" = self.by-version."semver"."4.3.1";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iced-spawn".">=0.0.8" =
+    self.by-version."iced-spawn"."1.0.0";
   by-spec."iced-spawn".">=1.0.0" =
     self.by-version."iced-spawn"."1.0.0";
   "iced-spawn" = self.by-version."iced-spawn"."1.0.0";
@@ -1011,6 +1602,7 @@
     self.by-version."iced-test"."0.0.21";
   by-version."iced-test"."0.0.21" = self.buildNodePackage {
     name = "iced-test-0.0.21";
+    version = "0.0.21";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz";
@@ -1021,15 +1613,20 @@
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-test" = self.by-version."iced-test"."0.0.21";
   by-spec."iced-utils"."0.1.20" =
     self.by-version."iced-utils"."0.1.20";
   by-version."iced-utils"."0.1.20" = self.buildNodePackage {
     name = "iced-utils-0.1.20";
+    version = "0.1.20";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz";
@@ -1040,13 +1637,18 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-utils" = self.by-version."iced-utils"."0.1.20";
   by-spec."iced-utils".">=0.1.11" =
     self.by-version."iced-utils"."0.1.22";
   by-version."iced-utils"."0.1.22" = self.buildNodePackage {
     name = "iced-utils-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz";
@@ -1057,16 +1659,23 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iced-utils".">=0.1.16" =
     self.by-version."iced-utils"."0.1.22";
   by-spec."iced-utils".">=0.1.18" =
     self.by-version."iced-utils"."0.1.22";
+  by-spec."iced-utils".">=0.1.22" =
+    self.by-version."iced-utils"."0.1.22";
   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";
@@ -1077,12 +1686,17 @@
       "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."inherits"."2" =
     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";
@@ -1091,7 +1705,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
@@ -1099,6 +1717,7 @@
     self.by-version."ipv6"."3.1.1";
   by-version."ipv6"."3.1.1" = self.buildNodePackage {
     name = "ipv6-3.1.1";
+    version = "3.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz";
@@ -1110,12 +1729,59 @@
       "cli-0.4.5" = self.by-version."cli"."0.4.5";
       "cliff-0.1.10" = self.by-version."cliff"."0.1.10";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.10.0" =
+    self.by-version."is-my-json-valid"."2.10.1";
+  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
+    name = "is-my-json-valid-2.10.1";
+    version = "2.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
+      name = "is-my-json-valid-2.10.1.tgz";
+      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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";
@@ -1124,26 +1790,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."isstream"."0.1.x" =
-    self.by-version."isstream"."0.1.1";
-  by-version."isstream"."0.1.1" = self.buildNodePackage {
-    name = "isstream-0.1.1";
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
-      name = "isstream-0.1.1.tgz";
-      sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f";
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
   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";
@@ -1152,12 +1830,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";
@@ -1166,42 +1849,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."kbpgp".">=1.0.2" =
-    self.by-version."kbpgp"."2.0.8";
-  by-version."kbpgp"."2.0.8" = self.buildNodePackage {
-    name = "kbpgp-2.0.8";
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.8.tgz";
-      name = "kbpgp-2.0.8.tgz";
-      sha1 = "5ede9539bce3564a53f8be72a75c7619414b6e08";
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
     };
     deps = {
-      "bn-1.0.1" = self.by-version."bn"."1.0.1";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c";
-      "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0";
-      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "kbpgp" = self.by-version."kbpgp"."2.0.8";
-  by-spec."kbpgp"."^1.0.2" =
-    self.by-version."kbpgp"."1.2.0";
-  by-version."kbpgp"."1.2.0" = self.buildNodePackage {
-    name = "kbpgp-1.2.0";
+  by-spec."kbpgp".">=2.0.9" =
+    self.by-version."kbpgp"."2.0.9";
+  by-version."kbpgp"."2.0.9" = self.buildNodePackage {
+    name = "kbpgp-2.0.9";
+    version = "2.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.2.0.tgz";
-      name = "kbpgp-1.2.0.tgz";
-      sha1 = "4305a67a740fb31843b4313b60a6137f2b93ddba";
+      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.9.tgz";
+      name = "kbpgp-2.0.9.tgz";
+      sha1 = "b4f8686abde8689a1d4abb36e070af78632ceb59";
     };
     deps = {
       "bn-1.0.1" = self.by-version."bn"."1.0.1";
@@ -1215,14 +1897,20 @@
       "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
       "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  "kbpgp" = self.by-version."kbpgp"."2.0.9";
   by-spec."kbpgp"."^2.0.0" =
-    self.by-version."kbpgp"."2.0.8";
+    self.by-version."kbpgp"."2.0.9";
   by-spec."keybase-compressjs"."^1.0.1-c" =
     self.by-version."keybase-compressjs"."1.0.1-c";
   by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage {
     name = "keybase-compressjs-1.0.1-c";
+    version = "1.0.1-c";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz";
@@ -1232,12 +1920,17 @@
     deps = {
       "commander-2.1.0" = self.by-version."commander"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keybase-ecurve"."^1.0.0" =
     self.by-version."keybase-ecurve"."1.0.0";
   by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage {
     name = "keybase-ecurve-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz";
@@ -1247,12 +1940,72 @@
     deps = {
       "bn-1.0.1" = self.by-version."bn"."1.0.1";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."keybase-installer"."1.0.1" =
+    self.by-version."keybase-installer"."1.0.1";
+  by-version."keybase-installer"."1.0.1" = self.buildNodePackage {
+    name = "keybase-installer-1.0.1";
+    version = "1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.1.tgz";
+      name = "keybase-installer-1.0.1.tgz";
+      sha1 = "31ca46388833665225e8113bdd79ded9b04e0862";
+    };
+    deps = {
+      "badnode-1.0.1" = self.by-version."badnode"."1.0.1";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "gpg-wrapper-1.0.4" = self.by-version."gpg-wrapper"."1.0.4";
+      "iced-data-structures-0.0.5" = self.by-version."iced-data-structures"."0.0.5";
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
+      "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
+      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
+      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "keybase-path-0.0.15" = self.by-version."keybase-path"."0.0.15";
+      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
+      "progress-1.1.3" = self.by-version."progress"."1.1.3";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."keybase-path"."0.0.15" =
+  "keybase-installer" = self.by-version."keybase-installer"."1.0.1";
+  by-spec."keybase-path"."0.0.16" =
+    self.by-version."keybase-path"."0.0.16";
+  by-version."keybase-path"."0.0.16" = self.buildNodePackage {
+    name = "keybase-path-0.0.16";
+    version = "0.0.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.16.tgz";
+      name = "keybase-path-0.0.16.tgz";
+      sha1 = "3d60804aa48274b628d802a212f5e0dfcc13acaa";
+    };
+    deps = {
+      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "keybase-path" = self.by-version."keybase-path"."0.0.16";
+  by-spec."keybase-path"."^0.0.15" =
     self.by-version."keybase-path"."0.0.15";
   by-version."keybase-path"."0.0.15" = self.buildNodePackage {
     name = "keybase-path-0.0.15";
+    version = "0.0.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz";
@@ -1262,18 +2015,22 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "keybase-path" = self.by-version."keybase-path"."0.0.15";
   by-spec."keybase-proofs"."^2.0.13" =
-    self.by-version."keybase-proofs"."2.0.15";
-  by-version."keybase-proofs"."2.0.15" = self.buildNodePackage {
-    name = "keybase-proofs-2.0.15";
+    self.by-version."keybase-proofs"."2.0.20";
+  by-version."keybase-proofs"."2.0.20" = self.buildNodePackage {
+    name = "keybase-proofs-2.0.20";
+    version = "2.0.20";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.15.tgz";
-      name = "keybase-proofs-2.0.15.tgz";
-      sha1 = "d9e0c265e005095f749058825a7f0db3ab5bcedc";
+      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.20.tgz";
+      name = "keybase-proofs-2.0.20.tgz";
+      sha1 = "bb8f76f51cd04ee3a2de8b7e786c717e718ec2c7";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
@@ -1282,33 +2039,44 @@
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.15";
-  by-spec."libkeybase"."^0.0.6" =
-    self.by-version."libkeybase"."0.0.6";
-  by-version."libkeybase"."0.0.6" = self.buildNodePackage {
-    name = "libkeybase-0.0.6";
+  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.20";
+  by-spec."libkeybase"."^1.0.2" =
+    self.by-version."libkeybase"."1.0.2";
+  by-version."libkeybase"."1.0.2" = self.buildNodePackage {
+    name = "libkeybase-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz";
-      name = "libkeybase-0.0.6.tgz";
-      sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e";
+      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.0.2.tgz";
+      name = "libkeybase-1.0.2.tgz";
+      sha1 = "742e4f5138faa8f912a70e126f0eda414bf8fc51";
     };
     deps = {
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
       "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-1.2.0" = self.by-version."kbpgp"."1.2.0";
+      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
       "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "libkeybase" = self.by-version."libkeybase"."0.0.6";
+  "libkeybase" = self.by-version."libkeybase"."1.0.2";
   by-spec."marked".">= 0.2.7" =
     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";
@@ -1317,12 +2085,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."merkle-tree"."0.0.12" =
     self.by-version."merkle-tree"."0.0.12";
   by-version."merkle-tree"."0.0.12" = self.buildNodePackage {
     name = "merkle-tree-0.0.12";
+    version = "0.0.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz";
@@ -1335,58 +2108,98 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "merkle-tree" = self.by-version."merkle-tree"."0.0.12";
-  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";
+  by-spec."mime-db"."~1.8.0" =
+    self.by-version."mime-db"."1.8.0";
+  by-version."mime-db"."1.8.0" = self.buildNodePackage {
+    name = "mime-db-1.8.0";
+    version = "1.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-      name = "mime-1.2.11.tgz";
-      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
+      name = "mime-db-1.8.0.tgz";
+      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."mime"."~1.2.9" =
-    self.by-version."mime"."1.2.11";
+  by-spec."mime-types"."~2.0.1" =
+    self.by-version."mime-types"."2.0.10";
+  by-version."mime-types"."2.0.10" = self.buildNodePackage {
+    name = "mime-types-2.0.10";
+    version = "2.0.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
+      name = "mime-types-2.0.10.tgz";
+      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+    };
+    deps = {
+      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.10";
   by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.1";
-  by-version."minimatch"."2.0.1" = self.buildNodePackage {
-    name = "minimatch-2.0.1";
+    self.by-version."minimatch"."2.0.4";
+  by-version."minimatch"."2.0.4" = self.buildNodePackage {
+    name = "minimatch-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
-      name = "minimatch-2.0.1.tgz";
-      sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
+      name = "minimatch-2.0.4.tgz";
+      sha1 = "83bea115803e7a097a78022427287edb762fafed";
     };
     deps = {
       "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist".">=0.0.8" =
-    self.by-version."minimist"."1.1.0";
-  by-version."minimist"."1.1.0" = self.buildNodePackage {
-    name = "minimist-1.1.0";
+    self.by-version."minimist"."1.1.1";
+  by-version."minimist"."1.1.1" = self.buildNodePackage {
+    name = "minimist-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
-      name = "minimist-1.1.0.tgz";
-      sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
+      name = "minimist-1.1.1.tgz";
+      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   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";
@@ -1395,12 +2208,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";
@@ -1409,7 +2227,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mkdirp" = self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.5" =
@@ -1418,6 +2240,7 @@
     self.by-version."more-entropy"."0.0.7";
   by-version."more-entropy"."0.0.7" = self.buildNodePackage {
     name = "more-entropy-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz";
@@ -1427,12 +2250,17 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    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";
@@ -1441,12 +2269,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."network-byte-order"."~0.2.0" =
     self.by-version."network-byte-order"."0.2.0";
   by-version."network-byte-order"."0.2.0" = self.buildNodePackage {
     name = "network-byte-order-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz";
@@ -1455,12 +2288,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uuid"."~1.4.0" =
     self.by-version."node-uuid"."1.4.3";
   by-version."node-uuid"."1.4.3" = self.buildNodePackage {
     name = "node-uuid-1.4.3";
+    version = "1.4.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
@@ -1469,26 +2307,36 @@
     };
     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";
+  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.3.0.tgz";
-      name = "oauth-sign-0.3.0.tgz";
-      sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
+      name = "oauth-sign-0.6.0.tgz";
+      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."^1.3.0" =
     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";
@@ -1498,12 +2346,17 @@
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."0.6.1" =
     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";
@@ -1514,13 +2367,37 @@
       "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."path-is-absolute"."^1.0.0" =
+    self.by-version."path-is-absolute"."1.0.0";
+  by-version."path-is-absolute"."1.0.0" = self.buildNodePackage {
+    name = "path-is-absolute-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
+      name = "path-is-absolute-1.0.0.tgz";
+      sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pgp-utils"."0.0.27" =
     self.by-version."pgp-utils"."0.0.27";
   by-version."pgp-utils"."0.0.27" = self.buildNodePackage {
     name = "pgp-utils-0.0.27";
+    version = "0.0.27";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz";
@@ -1531,12 +2408,17 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pgp-utils".">=0.0.21" =
     self.by-version."pgp-utils"."0.0.28";
   by-version."pgp-utils"."0.0.28" = self.buildNodePackage {
     name = "pgp-utils-0.0.28";
+    version = "0.0.28";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.28.tgz";
@@ -1547,19 +2429,24 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pgp-utils".">=0.0.22" =
     self.by-version."pgp-utils"."0.0.28";
-  "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
-  by-spec."pgp-utils".">=0.0.25" =
-    self.by-version."pgp-utils"."0.0.28";
   by-spec."pgp-utils".">=0.0.28" =
     self.by-version."pgp-utils"."0.0.28";
+  "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
+  by-spec."pgp-utils".">=0.0.8" =
+    self.by-version."pgp-utils"."0.0.28";
   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";
@@ -1568,12 +2455,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."progress"."1.1.3" =
     self.by-version."progress"."1.1.3";
   by-version."progress"."1.1.3" = self.buildNodePackage {
     name = "progress-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz";
@@ -1582,13 +2474,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "progress" = self.by-version."progress"."1.1.3";
   by-spec."progress"."~1.1.2" =
     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";
@@ -1597,12 +2494,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."punycode".">=0.2.0" =
     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";
@@ -1611,12 +2513,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."purepack"."1.0.1" =
     self.by-version."purepack"."1.0.1";
   by-version."purepack"."1.0.1" = self.buildNodePackage {
     name = "purepack-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz";
@@ -1625,31 +2532,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "purepack" = self.by-version."purepack"."1.0.1";
   by-spec."purepack".">=1" =
     self.by-version."purepack"."1.0.1";
   by-spec."purepack".">=1.0.1" =
     self.by-version."purepack"."1.0.1";
-  by-spec."qs"."~0.6.0" =
-    self.by-version."qs"."0.6.6";
-  by-version."qs"."0.6.6" = self.buildNodePackage {
-    name = "qs-0.6.6";
+  by-spec."qs"."~2.4.0" =
+    self.by-version."qs"."2.4.1";
+  by-version."qs"."2.4.1" = self.buildNodePackage {
+    name = "qs-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-      name = "qs-0.6.6.tgz";
-      sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
+      name = "qs-2.4.1.tgz";
+      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read"."keybase/read" =
     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 = fetchgit {
       url = "git://github.com/keybase/read";
@@ -1659,13 +2576,18 @@
     deps = {
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "read" = self.by-version."read"."1.0.5";
   by-spec."readable-stream"."1.1" =
     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";
@@ -1678,86 +2600,144 @@
       "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."request"."2.30.0" =
-    self.by-version."request"."2.30.0";
-  by-version."request"."2.30.0" = self.buildNodePackage {
-    name = "request-2.30.0";
+  by-spec."readable-stream"."~1.0.26" =
+    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/request/-/request-2.30.0.tgz";
-      name = "request-2.30.0.tgz";
-      sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861";
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
     };
     deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "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."request"."^2.34.0" =
+    self.by-version."request"."2.55.0";
+  by-version."request"."2.55.0" = self.buildNodePackage {
+    name = "request-2.55.0";
+    version = "2.55.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
+      name = "request-2.55.0.tgz";
+      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "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";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-0.13.0" = self.by-version."tough-cookie"."0.13.0";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "request" = self.by-version."request"."2.30.0";
+  by-spec."request"."^2.55.0" =
+    self.by-version."request"."2.55.0";
+  "request" = self.by-version."request"."2.55.0";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.3.1";
-  by-version."rimraf"."2.3.1" = self.buildNodePackage {
-    name = "rimraf-2.3.1";
+    self.by-version."rimraf"."2.3.2";
+  by-version."rimraf"."2.3.2" = self.buildNodePackage {
+    name = "rimraf-2.3.2";
+    version = "2.3.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz";
-      name = "rimraf-2.3.1.tgz";
-      sha1 = "f83df78c168d5daf9f021e8e092e7a165898ee75";
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
+      name = "rimraf-2.3.2.tgz";
+      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
     };
     deps = {
-      "glob-4.5.0" = self.by-version."glob"."4.5.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."semver".">=2.2.1" =
-    self.by-version."semver"."4.3.1";
-  by-version."semver"."4.3.1" = self.buildNodePackage {
-    name = "semver-4.3.1";
+  by-spec."semver".">=1" =
+    self.by-version."semver"."4.3.3";
+  by-version."semver"."4.3.3" = self.buildNodePackage {
+    name = "semver-4.3.3";
+    version = "4.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.1.tgz";
-      name = "semver-4.3.1.tgz";
-      sha1 = "beb0129575b95f76110b29af08d370fd9eeb34bf";
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
+      name = "semver-4.3.3.tgz";
+      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."semver".">=2.2.1" =
+    self.by-version."semver"."4.3.3";
   by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.1";
-  "semver" = self.by-version."semver"."4.3.1";
-  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";
+    self.by-version."semver"."4.3.3";
+  "semver" = self.by-version."semver"."4.3.3";
+  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-0.2.4.tgz";
-      name = "sntp-0.2.4.tgz";
-      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      name = "sntp-1.0.9.tgz";
+      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socks5-client"."0.x" =
     self.by-version."socks5-client"."0.3.6";
   by-version."socks5-client"."0.3.6" = self.buildNodePackage {
     name = "socks5-client-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz";
@@ -1768,7 +2748,11 @@
       "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1";
       "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socks5-client"."^0.3.6" =
     self.by-version."socks5-client"."0.3.6";
@@ -1779,6 +2763,7 @@
     self.by-version."socks5-http-client"."0.1.6";
   by-version."socks5-http-client"."0.1.6" = self.buildNodePackage {
     name = "socks5-http-client-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz";
@@ -1788,13 +2773,18 @@
     deps = {
       "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "socks5-http-client" = self.by-version."socks5-http-client"."0.1.6";
   by-spec."socks5-https-client"."^0.2.2" =
     self.by-version."socks5-https-client"."0.2.2";
   by-version."socks5-https-client"."0.2.2" = self.buildNodePackage {
     name = "socks5-https-client-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz";
@@ -1805,13 +2795,18 @@
       "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6";
       "starttls-0.2.1" = self.by-version."starttls"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2";
   by-spec."spotty"."^1.0.0" =
     self.by-version."spotty"."1.0.0";
   by-version."spotty"."1.0.0" = self.buildNodePackage {
     name = "spotty-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/spotty/-/spotty-1.0.0.tgz";
@@ -1822,13 +2817,18 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "spotty" = self.by-version."spotty"."1.0.0";
   by-spec."sprintf"."0.1.x" =
     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";
@@ -1837,12 +2837,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";
@@ -1851,12 +2856,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."starttls"."0.x" =
     self.by-version."starttls"."0.2.1";
   by-version."starttls"."0.2.1" = self.buildNodePackage {
     name = "starttls-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz";
@@ -1865,12 +2875,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string_decoder"."~0.10.x" =
     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";
@@ -1879,12 +2894,75 @@
     };
     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";
+      name = "stringstream-0.0.4.tgz";
+      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^2.0.1" =
+    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";
+      name = "strip-ansi-2.0.1.tgz";
+      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^1.3.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-version."supports-color"."1.3.1" = self.buildNodePackage {
+    name = "supports-color-1.3.1";
+    version = "1.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      name = "supports-color-1.3.1.tgz";
+      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tablify"."0.1.5" =
     self.by-version."tablify"."0.1.5";
   by-version."tablify"."0.1.5" = self.buildNodePackage {
     name = "tablify-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz";
@@ -1893,7 +2971,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "tablify" = self.by-version."tablify"."0.1.5";
   by-spec."tablify".">=0.1.5" =
@@ -1902,6 +2984,7 @@
     self.by-version."timeago"."0.1.0";
   by-version."timeago"."0.1.0" = self.buildNodePackage {
     name = "timeago-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz";
@@ -1910,28 +2993,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "timeago" = self.by-version."timeago"."0.1.0";
-  by-spec."tough-cookie"."~0.9.15" =
-    self.by-version."tough-cookie"."0.9.15";
-  by-version."tough-cookie"."0.9.15" = self.buildNodePackage {
-    name = "tough-cookie-0.9.15";
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."0.13.0";
+  by-version."tough-cookie"."0.13.0" = self.buildNodePackage {
+    name = "tough-cookie-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
-      name = "tough-cookie-0.9.15.tgz";
-      sha1 = "75617ac347e3659052b0350131885829677399f6";
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz";
+      name = "tough-cookie-0.13.0.tgz";
+      sha1 = "34531cfefeba2dc050fb8e9a3310f876cdcc24f4";
     };
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."triplesec".">=3.0.16" =
     self.by-version."triplesec"."3.0.19";
   by-version."triplesec"."3.0.19" = self.buildNodePackage {
     name = "triplesec-3.0.19";
+    version = "3.0.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz";
@@ -1945,29 +3038,39 @@
       "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "triplesec" = self.by-version."triplesec"."3.0.19";
   by-spec."triplesec".">=3.0.19" =
     self.by-version."triplesec"."3.0.19";
-  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";
+  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.3.0.tgz";
-      name = "tunnel-agent-0.3.0.tgz";
-      sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+      name = "tunnel-agent-0.4.0.tgz";
+      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tweetnacl"."^0.12.0" =
     self.by-version."tweetnacl"."0.12.2";
   by-version."tweetnacl"."0.12.2" = self.buildNodePackage {
     name = "tweetnacl-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz";
@@ -1976,28 +3079,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tweetnacl"."^0.12.2" =
     self.by-version."tweetnacl"."0.12.2";
   by-spec."underscore".">= 1.0.0" =
-    self.by-version."underscore"."1.8.2";
-  by-version."underscore"."1.8.2" = self.buildNodePackage {
-    name = "underscore-1.8.2";
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
-      name = "underscore-1.8.2.tgz";
-      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.4" =
     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";
@@ -2006,7 +3119,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
@@ -2014,6 +3131,7 @@
     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";
@@ -2022,12 +3140,17 @@
     };
     deps = {
     };
+    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";
@@ -2039,16 +3162,21 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "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."wordwrap"."~0.0.2" =
     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";
@@ -2057,12 +3185,17 @@
     };
     deps = {
     };
+    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";
@@ -2071,6 +3204,29 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."^4.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";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
 }
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
index 6cc775b72d3..b8419d32fed 100644
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ b/pkgs/applications/misc/librecad/2.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "librecad-2.0.2";
+  name = "librecad-2.0.7";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.2;
-    name = "librecad-2.0.2.tar.gz";
-    sha256 = "0a5rs1h4n74d4bnrj91ij6y6wzc8d6nbrg9lfwjx8icjjl6hqikm";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.7;
+    name = "librecad-2.0.7.tar.gz";
+    sha256 = "0r6d7fk9jl8368rbxzk9rwv0mciw28hlv77z29jf36amc42n6z4d";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index a1ed7b252a2..ac128b2460e 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
+    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index de83cf22e04..ce2875656b6 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
+    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 416913b7a55..9b39f1c3c38 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
+
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
-    sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq";
+    sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 240a975e611..821b362b365 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchhg, fetchurl, pythonPackages, curl }:
+{ stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }:
 
 let
   getmodel = name: sha256: {
     src = fetchurl {
-      url = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/${name}";
+      url = "http://www.tmbdev.net/ocropy/${name}";
       inherit sha256;
     };
     inherit name;
@@ -12,58 +12,47 @@ let
   models = [
     (getmodel "en-default.pyrnn.gz"
       "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp")
-    (getmodel "en-uw3-linerel-2.cmodel.gz"
-      "0zdw0db2znxxd4h7aa09506nkbxd1cfqacxzyzlx42bjn951wcpw")
-    (getmodel "en-mixed-3.ngraphs.gz"
-      "1fqw7pxmjwapirp9xv3b0gn9pk53q4740qn5dw4wxfxk9dpp9lr4")
-    (getmodel "en-space.model.gz"
-      "0w5hnjm6rz5iiw1p2yixj147ifq11s9jfzrxk4v4xxmcyn365096")
-    (getmodel "en-mixed.lineest.gz"
-      "0skrziksn3zb3g8588y7jd10pnl2pzrby0119ac0awapzzg9vkvw")
-    (getmodel "uw3unlv.pyrnn.gz"
-      "0g08q9cjxxx3mg1jn4654nalxr56y2jq1h33pwxrj5lrckr7grb9")
-    (getmodel "en-uw3unlv-perchar.cmodel.gz"
-      "1izvm0wkb2vh58hjp59fw97drv17zdzrw6mz3aanrg5ax6fnfadk")
-    (getmodel "gradient.lineest.gz"
-      "1bw9hj9byjxi31rjh2xiysnx8c72jz0npxa54xgjwsqg7ihl8jzw")
-    (getmodel "en-mixed-round1.lineest.gz"
-      "1fjkygyrg4ng7kx4iqa4yhgvmw1zq72p3q5p0hcb2xxhqc04vx7c")
-    (getmodel "frakant.pyrnn.gz"
-      "0i1k95f2a8qlc6m7qq11pmjfcimyrjsfjvv20nrs2ygp9pwskmxp")
     (getmodel "fraktur.pyrnn.gz"
       "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
   ];
+
+  version = "20150316";
 in
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
   name = "ocropus-${version}";
-  version = "20130905";
 
-  src = fetchhg {
-    url = "https://code.google.com/p/ocropus.ocropy";
-    rev = "a6e0fbd820ce";
-    sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
+  src = fetchFromGitHub {
+    sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
+    rev = "5ba07bb959d605ec15424dd2b8f3d7245820084e";
+    repo = "ocropy";
+    owner = "tmbdev";
   };
 
-  patches = [ ./display.patch ];
-
   propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
     matplotlib beautifulsoup4 pygtk lxml ];
 
   enableParallelBuilding = true;
   
   preConfigure = with stdenv.lib; ''
-    ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)}
+    ${concatStrings (map (x: "ln -s ${x.src} models/`basename ${x.name}`;")
+      models)}
+
+    substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out
+  '';
 
-    sed -i 's|/usr/local|'$out'|' ocrolib/common.py
-    sed -i 's|/usr/local|'$out'|' ocrolib/default.py
-    ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models
+  checkPhase = ''
+    patchShebangs ./run-test
+    substituteInPlace ./run-test \
+      --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES'
+    PATH=".:$PATH" ./run-test
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Open source document analysis and OCR system";
     license = licenses.asl20;
-    homepage = https://code.google.com/p/ocropus/;
-    maintainers = with maintainers; [ iElectric viric ];
+    homepage = https://github.com/tmbdev/ocropy/;
+    maintainers = with maintainers; [ iElectric nckx viric ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/ocropus/display.patch b/pkgs/applications/misc/ocropus/display.patch
deleted file mode 100644
index 2b4e63652b7..00000000000
--- a/pkgs/applications/misc/ocropus/display.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://code.google.com/p/ocropus/issues/detail?id=365
-
-diff --git a/setup.py b/setup.py
-index c6ade25..a2ad6bf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -8,7 +8,10 @@ assert sys.version_info[0]==2 and sys.version_info[1]>=7,\
- from distutils.core import setup, Extension, Command
- from distutils.command.install_data import install_data
- 
-+import matplotlib
-+matplotlib.use('Agg')
- from ocrolib import default
-+
- modeldir = "models/"
- modelfiles = default.installable
- modelprefix = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/"
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 5f75c05a68f..cc8bd42ec39 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, python, fetchurl }:
 
-buildPythonPackage {
-  name = "ranger-1.6.1";
+buildPythonPackage rec {
+  name = "ranger-1.7.0";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -12,11 +12,9 @@ buildPythonPackage {
   };
 
   src = fetchurl {
-    url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz";
-    sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc";
+    url = "http://ranger.nongnu.org/${name}.tar.gz";
+    sha256 = "066lp1k2zcz2lnww2aj0m3fgn9g5ms67kxgclhgq66pxkjwgc4kx";
   };
 
-  doCheck = false;
-
   propagatedBuildInputs = with python.modules; [ curses ];
 }
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index bb0cf451957..a57647e18e7 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,17 +5,17 @@ let
     if stdenv.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "03dj0ivavxlcvx7dv7y6zllwqkclfyxkfax691zv2qclmk5gf8wz";
+      sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "11by4lkij1ryv8h3mz55hj3ssrikl697rs5b7mlg3g058gr2v3wl";
+      sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5";
     };
 
 in
 
 stdenv.mkDerivation {
-  name = "rescuetime-2.8.6.1015";
+  name = "rescuetime-2.8.8.1040";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
new file mode 100644
index 00000000000..30ce67a82f6
--- /dev/null
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgs, python, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  version = "1.2.2";
+  name = "rtv-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/michael-lazar/rtv/archive/v${version}.tar.gz";
+    sha256 = "0pisairv28lhqvq8zs0whz3ww8fraj98941kk5idyxadbq0icmk3";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    requests
+    six
+    praw
+    python.modules.curses
+  ];
+
+  meta = {
+    homepage = https://github.com/michael-lazar/rtv;
+    description = "Browse Reddit from your Terminal";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
+
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 746b5e5ef46..0d3337b478f 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "synergy";
     repo = "synergy";
     rev = version;
-    sha256 = "0himg6c50x5wz5nc6rgd54rph1w6nin6j9f08pa4spsxn9b5h8ks";
+    sha256 = "0n4zvz669vi2wyn6i6xhxp0j3nvjl4yzm441cqv6hb0d5k26wbcn";
   };
 
   patches = optional stdenv.isLinux ./cryptopp.patch;
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 5133ad3c29e..c338a101563 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,50 +1,27 @@
-x@{builderDefsPackage
-  , jre, unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, jre }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="vue";
-    version="3.2.2";
-    name="${baseName}-${version}";
-    url="releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
-    hash="0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
+stdenv.mkDerivation rec {
+  name = "vue-${version}";
+  version = "3.2.2";
+  src = fetchurl {
+    url = "releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
+    sha256 = "0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy"];
+  phases = "installPhase";
 
-  doDeploy = a.fullDepEntry ''
+  installPhase = ''
     mkdir -p "$out"/{share/vue,bin}
     cp ${src} "$out/share/vue/vue.jar"
-    echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
-    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
+    echo '#!${stdenv.shell}' >> "$out/bin/vue"
+    echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
     chmod a+x "$out/bin/vue"
-  '' ["addInputs" "defEnsureDir"];
+  '';
 
   meta = {
     description = "Visual Understanding Environment - mind mapping software";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.free; # Apache License fork, actually
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.free; # Apache License fork, actually
   };
-}) x
+}
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 4ff838db653..69b98bc6f44 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "xkblayout-state-${version}";
+  name = "${pname}-${version}";
+  pname = "xkblayout-state";
   version = "1b";
 
   src = fetchurl {
-    url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz";
+    url = "https://github.com/nonpop/${pname}/archive/v${version}.tar.gz";
     sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx";
   };
 
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index e65faeac6c2..dd3903cde27 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,13 +1,12 @@
-{ composableDerivation, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
+{ stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
 
-let inherit (composableDerivation) edf wwf; in
-
-composableDerivation.composableDerivation {} ( fixed : {
-  name = "yate-2.2.0_1";
+stdenv.mkDerivation rec {
+  name = "yate-${version}";
+  version = "5.4.2-1";
 
   src = fetchurl {
-    url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
-    sha256 = "1z1rvzcw6449cvczig1dkh6rlp6f8zv649sk0ldz38mwkyd07257";
+    url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz";
+    sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n";
   };
 
   # TODO zaptel ? postgres ?
@@ -17,7 +16,7 @@ composableDerivation.composableDerivation {} ( fixed : {
   preConfigure =
     ''
       sed -i 's@,/dev/null@@' configure
-    ''; 
+    '';
 
   # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
   preBuild =
@@ -28,12 +27,14 @@ composableDerivation.composableDerivation {} ( fixed : {
         -e 's@-Wl,--retain-symbols-file@@'
     '';
 
-  meta = { 
-    description = "YATE - Yet Another Telephony Engine";
+  meta = {
+    description = "Yet another telephony engine";
     homepage = http://yate.null.ro/;
-    license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
+    # Yate's license is GPL with an exception for linking with
+    # OpenH323 and PWlib (licensed under MPL).
+    license = ["GPL" "MPL"];
     maintainers = [ lib.maintainers.marcweber ];
     platforms = lib.platforms.linux;
   };
 
-} )
+}