about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-11-23 02:06:26 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-11-23 02:06:26 +0100
commitf01dd648f5253e5bdc439e7369349015af42b5c5 (patch)
treea39aba0a39205df3d49773dafef63d88b86d1890 /pkgs/development
parent02668d6c6a8e5492be4339d715da570de9fae8f3 (diff)
parent38d77bc86b83f01ef6cd91fa4b6090f5373bc692 (diff)
downloadnixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar.gz
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar.bz2
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar.lz
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar.xz
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.tar.zst
nixlib-f01dd648f5253e5bdc439e7369349015af42b5c5.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/asn1c/default.nix33
-rw-r--r--pkgs/development/compilers/colm/default.nix4
-rw-r--r--pkgs/development/compilers/elm/default.nix4
-rw-r--r--pkgs/development/compilers/elm/packages/elm-compiler.nix9
-rw-r--r--pkgs/development/compilers/elm/packages/elm-format.nix16
-rw-r--r--pkgs/development/compilers/elm/packages/elm-make.nix6
-rw-r--r--pkgs/development/compilers/elm/packages/elm-package.nix6
-rw-r--r--pkgs/development/compilers/elm/packages/elm-reactor-elm.nix20
-rw-r--r--pkgs/development/compilers/elm/packages/elm-reactor.nix6
-rw-r--r--pkgs/development/compilers/elm/packages/elm-repl.nix6
-rw-r--r--pkgs/development/compilers/elm/packages/release.nix2
-rwxr-xr-xpkgs/development/compilers/elm/update-elm.rb12
-rw-r--r--pkgs/development/compilers/ghc/head.nix22
-rw-r--r--pkgs/development/compilers/ghcjs/base.nix186
-rw-r--r--pkgs/development/compilers/ghcjs/default.nix180
-rw-r--r--pkgs/development/compilers/ghcjs/head.nix208
-rw-r--r--pkgs/development/compilers/ghcjs/head_shims.nix4
-rw-r--r--pkgs/development/compilers/ghcjs/head_stage2.nix345
-rw-r--r--pkgs/development/compilers/rust/rustc.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix43
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix82
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml51
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix37
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1182
-rw-r--r--pkgs/development/haskell-modules/with-packages-wrapper.nix5
-rw-r--r--pkgs/development/interpreters/erlang/R16B03-1-basho.nix98
-rw-r--r--pkgs/development/interpreters/erlang/R17.nix2
-rw-r--r--pkgs/development/interpreters/erlang/R18.nix6
-rw-r--r--pkgs/development/interpreters/erlang/R19.nix6
-rw-r--r--pkgs/development/interpreters/groovy/default.nix4
-rw-r--r--pkgs/development/interpreters/php/default.nix8
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix36
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch (renamed from pkgs/development/interpreters/spidermonkey/arm-flags.patch)0
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch (renamed from pkgs/development/interpreters/spidermonkey/findvanilla.patch)0
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5.nix (renamed from pkgs/development/interpreters/spidermonkey/185-1.0.0.nix)12
-rw-r--r--pkgs/development/interpreters/spidermonkey/17.nix (renamed from pkgs/development/interpreters/spidermonkey/17.0.nix)0
-rw-r--r--pkgs/development/interpreters/spidermonkey/24.nix (renamed from pkgs/development/interpreters/spidermonkey/24.2.nix)5
-rw-r--r--pkgs/development/interpreters/spidermonkey/31.nix (renamed from pkgs/development/interpreters/spidermonkey/31.5.nix)6
-rw-r--r--pkgs/development/interpreters/spidermonkey/38.nix61
-rw-r--r--pkgs/development/interpreters/spidermonkey/Makefile.extra10
-rw-r--r--pkgs/development/interpreters/spidermonkey/default.nix37
-rw-r--r--pkgs/development/libraries/atkmm/default.nix2
-rw-r--r--pkgs/development/libraries/cairomm/default.nix2
-rw-r--r--pkgs/development/libraries/glfw/3.x.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/base/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/core/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/ges/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/good/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/gstreamermm/default.nix6
-rw-r--r--pkgs/development/libraries/gstreamer/libav/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/python/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/ugly/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/vaapi/default.nix15
-rw-r--r--pkgs/development/libraries/gstreamer/validate/default.nix8
-rw-r--r--pkgs/development/libraries/gtkmm/2.x.nix2
-rw-r--r--pkgs/development/libraries/gtkmm/3.x.nix2
-rw-r--r--pkgs/development/libraries/java/shared-objects/default.nix14
-rw-r--r--pkgs/development/libraries/kde-frameworks/default.nix7
-rw-r--r--pkgs/development/libraries/kde-frameworks/kde-env.nix31
-rw-r--r--pkgs/development/libraries/kde-frameworks/kde-wrapper.nix43
-rw-r--r--pkgs/development/libraries/libfilezilla/default.nix6
-rw-r--r--pkgs/development/libraries/libktorrent/5.nix29
-rw-r--r--pkgs/development/libraries/libktorrent/default.nix2
-rw-r--r--pkgs/development/libraries/libproxy/default.nix21
-rw-r--r--pkgs/development/libraries/libxmlxx/v3.nix4
-rw-r--r--pkgs/development/libraries/menu-cache/default.nix4
-rw-r--r--pkgs/development/libraries/mesa/default.nix9
-rw-r--r--pkgs/development/libraries/netcdf-fortran/default.nix10
-rw-r--r--pkgs/development/libraries/pangomm/default.nix2
-rw-r--r--pkgs/development/libraries/polkit/default.nix4
-rw-r--r--pkgs/development/libraries/qt-5/5.6/default.nix2
-rw-r--r--pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix7
-rw-r--r--pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix40
-rw-r--r--pkgs/development/libraries/science/math/openblas/default.nix7
-rw-r--r--pkgs/development/libraries/slang/default.nix4
-rw-r--r--pkgs/development/node-packages/node-packages-v4.nix3776
-rw-r--r--pkgs/development/node-packages/node-packages-v6.nix3484
-rw-r--r--pkgs/development/ocaml-modules/asn1-combinators/default.nix37
-rw-r--r--pkgs/development/ocaml-modules/cstruct/default.nix10
-rw-r--r--pkgs/development/ocaml-modules/erm_xmpp/0.3.nix29
-rw-r--r--pkgs/development/ocaml-modules/menhir/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/nocrypto/default.nix33
-rw-r--r--pkgs/development/ocaml-modules/notty/default.nix37
-rw-r--r--pkgs/development/ocaml-modules/otr/default.nix43
-rw-r--r--pkgs/development/ocaml-modules/tls/default.nix41
-rw-r--r--pkgs/development/ocaml-modules/x509/default.nix28
-rw-r--r--pkgs/development/python-modules/pygobject/3.nix2
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix6
-rw-r--r--pkgs/development/tools/analysis/checkstyle/default.nix4
-rw-r--r--pkgs/development/tools/bloaty/default.nix31
-rw-r--r--pkgs/development/tools/continuous-integration/jenkins/default.nix4
-rw-r--r--pkgs/development/tools/doctl/default.nix19
-rw-r--r--pkgs/development/tools/godef/default.nix2
-rw-r--r--pkgs/development/tools/jsduck/Gemfile3
-rw-r--r--pkgs/development/tools/jsduck/Gemfile.lock23
-rw-r--r--pkgs/development/tools/jsduck/default.nix31
-rw-r--r--pkgs/development/tools/jsduck/gemset.nix51
-rw-r--r--pkgs/development/tools/misc/elfutils/default.nix2
-rw-r--r--pkgs/development/tools/misc/tokei/default.nix7
-rw-r--r--pkgs/development/tools/misc/uncrustify/default.nix14
-rw-r--r--pkgs/development/tools/misc/xxdiff/default.nix15
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix4
-rw-r--r--pkgs/development/tools/parsing/jikespg/default.nix12
-rw-r--r--pkgs/development/tools/parsing/ragel/default.nix4
-rw-r--r--pkgs/development/tools/scalafmt/default.nix4
-rw-r--r--pkgs/development/web/nodejs/v7.nix11
107 files changed, 7137 insertions, 3717 deletions
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
new file mode 100644
index 000000000000..d3c4bf19a65b
--- /dev/null
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "asn1c-${version}";
+  version = "0.9.27";
+
+  src = fetchurl {
+    url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
+    sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2";
+  };
+
+  outputs = [ "out" "doc" "man" ];
+
+  buildInputs = [ perl ];
+
+  preConfigure = ''
+    patchShebangs examples/crfc2asn1.pl
+  '';
+
+  postInstall = ''
+    cp -r skeletons/standard-modules $out/share/asn1c
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://lionet.info/asn1c/compiler.html;
+    description = "Open Source ASN.1 Compiler";
+    license = licenses.bsd2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.montag451 ];
+  };
+}
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index b7773a91d983..8cf8a04f4eb5 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "colm-${version}";
-  version = "0.13.0.3";
+  version = "0.13.0.4";
 
   src = fetchurl {
     url = "http://www.colm.net/files/colm/${name}.tar.gz";
-    sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2";
+    sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 950caeedf53b..e125a050b249 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -80,9 +80,9 @@ let
       };
   };
 in hsPkgs.elmPkgs // {
-  elm = buildEnv {
+  elm = lib.hiPrio (buildEnv {
     name = "elm-${hsPkgs.elmVersion}";
     paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
     pathsToLink = [ "/bin" ];
-  };
+  });
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index f6a92b64f6d7..b0943f1ece35 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -7,11 +7,11 @@
 }:
 mkDerivation {
   pname = "elm-compiler";
-  version = "0.17.1";
+  version = "0.18";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if";
-    rev = "e44deafaf9cbf3749484070f267f03a368711adb";
+    sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh";
+    rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80";
   };
   isLibrary = true;
   isExecutable = true;
@@ -35,4 +35,7 @@ mkDerivation {
   homepage = "http://elm-lang.org";
   description = "Values to help with elm-package, elm-make, and elm-lang.org.";
   license = stdenv.lib.licenses.bsd3;
+  # added manually since tests are not passing
+  # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852
+  doCheck = false;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 4d30c697abd4..48eafff6f724 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -7,11 +7,11 @@
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.4.0";
+  version = "0.5.2";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm";
-    rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0";
+    sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8";
+    rev = "e452ed9342620e7bb0bc822983b96411d57143ef";
   };
   isLibrary = false;
   isExecutable = true;
@@ -32,14 +32,4 @@ mkDerivation {
   homepage = "http://elm-lang.org";
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
-
-  # XXX: I've manually disabled tests, only the following test is failing
-  # ...
-  # ElmFormat.Cli
-  #   format a single file in place:                    OK
-  #   usage instructions:                               FAIL
-  # ...
-  # 1 out of 266 tests failed (0.50s)
-  # Test suite elm-format-tests: FAIL
-  doCheck = false;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
index bed7698cfe42..dc1760e2958b 100644
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@@ -5,11 +5,11 @@
 }:
 mkDerivation {
   pname = "elm-make";
-  version = "0.17.1";
+  version = "0.18";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-make";
-    sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw";
-    rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335";
+    sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2";
+    rev = "1a554833a70694ab142b9179bfac996143f68d9e";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index faf46e859c94..f93432dc0a30 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -7,11 +7,11 @@
 }:
 mkDerivation {
   pname = "elm-package";
-  version = "0.17.1";
+  version = "0.18";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-package";
-    sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85";
-    rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd";
+    sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
+    rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
index 790430125901..90c8956323b5 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@@ -1,22 +1,22 @@
 {
   "elm-lang/virtual-dom" = {
-    version = "1.1.0";
-    sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz";
+    version = "2.0.1";
+    sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3";
   };
   "evancz/elm-markdown" = {
-    version = "3.0.0";
-    sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6";
+    version = "3.0.1";
+    sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj";
   };
   "elm-lang/html" = {
-    version = "1.1.0";
-    sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y";
+    version = "2.0.0";
+    sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi";
   };
   "elm-lang/svg" = {
-    version = "1.1.1";
-    sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn";
+    version = "2.0.0";
+    sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l";
   };
   "elm-lang/core" = {
-    version = "4.0.2";
-    sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6";
+    version = "5.0.0";
+    sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn";
   };
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
index cf6d33a5acb4..08bf5779b74a 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "elm-reactor";
-  version = "0.17.1";
+  version = "0.18";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8";
-    rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63";
+    sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65";
+    rev = "c519d4ec0aaf2f043a416fe858346b0181eca516";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
index e08c295f294c..64e29596099c 100644
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "elm-repl";
-  version = "0.17.1";
+  version = "0.18";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-repl";
-    sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28";
-    rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30";
+    sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5";
+    rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix
index 6817d8e297f4..fd4e08fff09c 100644
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ b/pkgs/development/compilers/elm/packages/release.nix
@@ -2,7 +2,7 @@
 # Please, do not modify it by hand!
 { callPackage }:
 {
-  version = "0.17.1";
+  version = "0.18.0";
   packages = {
     elm-compiler = callPackage ./elm-compiler.nix { };
     elm-package = callPackage ./elm-package.nix { };
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
index a1f76945cd2c..5169ff3fd29a 100755
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ b/pkgs/development/compilers/elm/update-elm.rb
@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.17.1"
-$elm_packages = { "elm-compiler" => "0.17.1",
-                  "elm-package" => "0.17.1",
-                  "elm-make" => "0.17.1",
-                  "elm-reactor" => "0.17.1",
-                  "elm-repl" => "0.17.1"
+$elm_version = "0.18.0"
+$elm_packages = { "elm-compiler" => "0.18.0",
+                  "elm-package" => "0.18.0",
+                  "elm-make" => "0.18.0",
+                  "elm-reactor" => "0.18.0",
+                  "elm-repl" => "0.18.0"
                 }
 
 for pkg, ver in $elm_packages
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index aec6faed585e..23a1b2821492 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, autoconf, automake, happy, alex, cross ? null
+, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null
 }:
 
 let
@@ -66,6 +66,11 @@ in stdenv.mkDerivation (rec {
 
   passthru = {
     inherit bootPkgs;
+  } // stdenv.lib.optionalAttrs (crossSystem != null) {
+    crossCompiler = selfPkgs.ghc.override {
+      cross = crossSystem;
+      bootPkgs = selfPkgs;
+    };
   };
 
   meta = {
@@ -86,11 +91,24 @@ in stdenv.mkDerivation (rec {
   '';
 
   configureFlags = [
-    "CC=${cross.config}-cc"
+    "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
+    "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld"
+    "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar"
+    "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
+    "--enable-bootstrap-with-devel-snapshot"
   ];
 
   buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
 
   dontSetConfigureCross = true;
+
+  passthru = {
+    inherit bootPkgs cross;
+
+    cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
+
+    ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld";
+  };
 })
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
new file mode 100644
index 000000000000..f8b861311d60
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -0,0 +1,186 @@
+{ mkDerivation
+, test-framework
+, test-framework-hunit
+, test-framework-quickcheck2
+, data-default
+, ghc-paths
+, haskell-src-exts
+, haskell-src-meta
+, optparse-applicative
+, system-fileio
+, system-filepath
+, text-binary
+, unordered-containers
+, cabal-install
+, wl-pprint-text
+, base16-bytestring
+, executable-path
+, transformers-compat
+, haddock-api
+, ghcjs-prim
+, regex-posix
+, callPackage
+
+, bootPkgs, gmp
+, jailbreak-cabal
+
+, runCommand
+, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
+, time
+, zlib, aeson, attoparsec, bzlib, hashable
+, lens
+, parallel, safe, shelly, split, stringsearch, syb
+, tar, terminfo
+, vector, yaml, fetchgit, fetchFromGitHub, Cabal
+, alex, happy, git, gnumake, autoconf, patch
+, automake, libtool
+, cryptohash
+, haddock, hspec, xhtml, primitive, cacert, pkgs
+, coreutils
+, libiconv
+
+, version ? "0.2.0"
+, ghcjsSrc ? fetchFromGitHub {
+    owner = "ghcjs";
+    repo = "ghcjs";
+    rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
+    sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
+  }
+, ghcjsBootSrc ? fetchgit {
+    url = git://github.com/ghcjs/ghcjs-boot.git;
+    rev = "8c549931da27ba9e607f77195208ec156c840c8a";
+    sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
+    fetchSubmodules = true;
+  }
+, ghcjsBoot ? import ./ghcjs-boot.nix {
+    inherit runCommand;
+    src = ghcjsBootSrc;
+  }
+, shims ? import ./shims.nix { inherit fetchFromGitHub; }
+
+# This is the list of the Stage 1 packages that are built into a booted ghcjs installation
+# It can be generated with the command:
+# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/      \"\1\"/'"
+, stage1Packages ? [
+    "array"
+    "base"
+    "binary"
+    "bytestring"
+    "containers"
+    "deepseq"
+    "directory"
+    "filepath"
+    "ghc-boot"
+    "ghc-boot-th"
+    "ghc-prim"
+    "ghci"
+    "ghcjs-prim"
+    "ghcjs-th"
+    "integer-gmp"
+    "pretty"
+    "primitive"
+    "process"
+    "rts"
+    "template-haskell"
+    "time"
+    "transformers"
+    "unix"
+  ]
+
+, stage2 ? import ./stage2.nix
+}:
+let
+  inherit (bootPkgs) ghc;
+
+in mkDerivation (rec {
+  pname = "ghcjs";
+  inherit version;
+  src = ghcjsSrc;
+  isLibrary = true;
+  isExecutable = true;
+  jailbreak = true;
+  doHaddock = false;
+  doCheck = false;
+  buildDepends = [
+    filepath HTTP mtl network random stm time zlib aeson attoparsec
+    bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
+    lens optparse-applicative parallel safe shelly split
+    stringsearch syb system-fileio system-filepath tar terminfo text-binary
+    unordered-containers vector wl-pprint-text yaml
+    alex happy git gnumake autoconf automake libtool patch gmp
+    base16-bytestring cryptohash executable-path haddock-api
+    transformers-compat QuickCheck haddock hspec xhtml
+    ghcjs-prim regex-posix libiconv
+  ];
+  buildTools = [ nodejs git ];
+  testDepends = [
+    HUnit test-framework test-framework-hunit
+  ];
+  patches = [ ./ghcjs.patch ];
+  postPatch = ''
+    substituteInPlace Setup.hs \
+      --replace "/usr/bin/env" "${coreutils}/bin/env"
+
+    substituteInPlace src/Compiler/Info.hs \
+      --replace "@PREFIX@" "$out"          \
+      --replace "@VERSION@" "${version}"
+
+    substituteInPlace src-bin/Boot.hs \
+      --replace "@PREFIX@" "$out"     \
+      --replace "@CC@"     "${stdenv.cc}/bin/cc"
+  '';
+  preBuild = ''
+    export HOME="$TMP"
+
+    local topDir=$out/lib/ghcjs-${version}
+    mkdir -p $topDir
+
+    cp -r ${ghcjsBoot} $topDir/ghcjs-boot
+    chmod -R u+w $topDir/ghcjs-boot
+
+    cp -r ${shims} $topDir/shims
+    chmod -R u+w $topDir/shims
+
+    # Make the patches be relative their corresponding package's directory.
+    # See: https://github.com/ghcjs/ghcjs-boot/pull/12
+    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
+      echo "fixing patch: $patch"
+      sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
+    done
+  '';
+  # We build with --quick so we can build stage 2 packages separately.
+  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
+  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
+  postInstall = ''
+    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
+      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
+        --dev \
+        --quick \
+        --with-cabal ${cabal-install}/bin/cabal \
+        --with-gmp-includes ${gmp.dev}/include \
+        --with-gmp-libraries ${gmp.out}/lib
+  '';
+  passthru = let
+    ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
+      generated = ./node-packages-generated.nix;
+      self = ghcjsNodePkgs;
+    };
+  in {
+    inherit bootPkgs;
+    isCross = true;
+    isGhcjs = true;
+    inherit nodejs ghcjsBoot;
+    inherit (ghcjsNodePkgs) "socket.io";
+
+    inherit stage1Packages;
+    mkStage2 = stage2 {
+      inherit ghcjsBoot;
+    };
+  };
+
+  homepage = "https://github.com/ghcjs/ghcjs";
+  description = "A Haskell to JavaScript compiler that uses the GHC API";
+  license = stdenv.lib.licenses.bsd3;
+  platforms = ghc.meta.platforms;
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+})
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 565215f474ea..7400057b128f 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -1,179 +1,3 @@
-{ mkDerivation
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, data-default
-, ghc-paths
-, haskell-src-exts
-, haskell-src-meta
-, optparse-applicative
-, system-fileio
-, system-filepath
-, text-binary
-, unordered-containers
-, cabal-install
-, wl-pprint-text
-, base16-bytestring
-, executable-path
-, transformers-compat
-, haddock-api
-, ghcjs-prim
-, regex-posix
-, callPackage
+{ bootPkgs }:
 
-, bootPkgs, gmp
-, jailbreak-cabal
-
-, runCommand
-, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
-, time
-, zlib, aeson, attoparsec, bzlib, hashable
-, lens
-, parallel, safe, shelly, split, stringsearch, syb
-, tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
-, alex, happy, git, gnumake, autoconf, patch
-, automake, libtool
-, cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
-, coreutils
-, libiconv
-
-, ghcjsBootSrc ? fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "8c549931da27ba9e607f77195208ec156c840c8a";
-    sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
-    fetchSubmodules = true;
-  }
-, ghcjsBoot ? import ./ghcjs-boot.nix {
-    inherit runCommand;
-    src = ghcjsBootSrc;
-  }
-, shims ? import ./shims.nix { inherit fetchFromGitHub; }
-}:
-let
-  inherit (bootPkgs) ghc;
-  version = "0.2.0";
-
-in mkDerivation (rec {
-  pname = "ghcjs";
-  inherit version;
-  src = fetchFromGitHub {
-    owner = "ghcjs";
-    repo = "ghcjs";
-    rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
-    sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  jailbreak = true;
-  doHaddock = false;
-  doCheck = false;
-  buildDepends = [
-    filepath HTTP mtl network random stm time zlib aeson attoparsec
-    bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
-    lens optparse-applicative parallel safe shelly split
-    stringsearch syb system-fileio system-filepath tar terminfo text-binary
-    unordered-containers vector wl-pprint-text yaml
-    alex happy git gnumake autoconf automake libtool patch gmp
-    base16-bytestring cryptohash executable-path haddock-api
-    transformers-compat QuickCheck haddock hspec xhtml
-    ghcjs-prim regex-posix libiconv
-  ];
-  buildTools = [ nodejs git ];
-  testDepends = [
-    HUnit test-framework test-framework-hunit
-  ];
-  patches = [ ./ghcjs.patch ];
-  postPatch = ''
-    substituteInPlace Setup.hs \
-      --replace "/usr/bin/env" "${coreutils}/bin/env"
-
-    substituteInPlace src/Compiler/Info.hs \
-      --replace "@PREFIX@" "$out"          \
-      --replace "@VERSION@" "${version}"
-
-    substituteInPlace src-bin/Boot.hs \
-      --replace "@PREFIX@" "$out"     \
-      --replace "@CC@"     "${stdenv.cc}/bin/cc"
-  '';
-  preBuild = ''
-    export HOME="$TMP"
-
-    local topDir=$out/lib/ghcjs-${version}
-    mkdir -p $topDir
-
-    cp -r ${ghcjsBoot} $topDir/ghcjs-boot
-    chmod -R u+w $topDir/ghcjs-boot
-
-    cp -r ${shims} $topDir/shims
-    chmod -R u+w $topDir/shims
-
-    # Make the patches be relative their corresponding package's directory.
-    # See: https://github.com/ghcjs/ghcjs-boot/pull/12
-    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
-      echo "fixing patch: $patch"
-      sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
-    done
-  '';
-  # We build with --quick so we can build stage 2 packages separately.
-  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
-  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
-  postInstall = ''
-    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
-      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
-        --dev \
-        --quick \
-        --with-cabal ${cabal-install}/bin/cabal \
-        --with-gmp-includes ${gmp.dev}/include \
-        --with-gmp-libraries ${gmp.out}/lib
-  '';
-  passthru = let
-    ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
-      generated = ./node-packages-generated.nix;
-      self = ghcjsNodePkgs;
-    };
-  in {
-    inherit bootPkgs;
-    isCross = true;
-    isGhcjs = true;
-    inherit nodejs ghcjsBoot;
-    inherit (ghcjsNodePkgs) "socket.io";
-
-    # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
-    # It can be generated with the command:
-    # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/      \"\1\"/'"
-    stage1Packages = [
-      "array"
-      "base"
-      "binary"
-      "rts"
-      "bytestring"
-      "containers"
-      "deepseq"
-      "directory"
-      "filepath"
-      "ghc-prim"
-      "ghcjs-prim"
-      "integer-gmp"
-      "old-locale"
-      "pretty"
-      "primitive"
-      "process"
-      "template-haskell"
-      "time"
-      "transformers"
-      "unix"
-    ];
-
-    mkStage2 = import ./stage2.nix {
-      inherit ghcjsBoot;
-    };
-  };
-
-  homepage = "https://github.com/ghcjs/ghcjs";
-  description = "A Haskell to JavaScript compiler that uses the GHC API";
-  license = stdenv.lib.licenses.bsd3;
-  platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-})
+bootPkgs.callPackage ./base.nix { inherit bootPkgs; }
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 2bf13cb895f5..b191f9655d2a 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -1,178 +1,50 @@
-{ mkDerivation
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, data-default
-, ghc-paths
-, haskell-src-exts
-, haskell-src-meta
-, optparse-applicative
-, system-fileio
-, system-filepath
-, text-binary
-, unordered-containers
-, cabal-install
-, wl-pprint-text
-, base16-bytestring
-, executable-path
-, transformers-compat
-, haddock-api
-, regex-posix
-, callPackage
+{ fetchgit, fetchFromGitHub, bootPkgs }:
 
-, bootPkgs, gmp
-, jailbreak-cabal
-
-, runCommand
-, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
-, time
-, zlib, aeson, attoparsec, bzlib, hashable
-, lens
-, parallel, safe, shelly, split, stringsearch, syb
-, tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
-, alex, happy, git, gnumake, autoconf, patch
-, automake, libtool
-, cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
-, coreutils
-, libiconv
-
-, ghcjsBootSrc ? fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
-    sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
-    fetchSubmodules = true;
-  }
-, ghcjsBoot ? import ./ghcjs-boot.nix {
-    inherit runCommand;
-    src = ghcjsBootSrc;
-  }
-, shims ? import ./head_shims.nix { inherit fetchFromGitHub; }
-}:
-let
-  inherit (bootPkgs) ghc;
+bootPkgs.callPackage ./base.nix {
   version = "0.2.020161101";
 
-in mkDerivation (rec {
-  pname = "ghcjs";
-  inherit version;
-  src = fetchFromGitHub {
+  # deprecated on HEAD, directly included in the distribution
+  ghcjs-prim = null;
+  inherit bootPkgs;
+
+  ghcjsSrc = fetchFromGitHub {
     owner = "ghcjs";
     repo = "ghcjs";
     rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
     sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
   };
-  isLibrary = true;
-  isExecutable = true;
-  jailbreak = true;
-  doHaddock = false;
-  doCheck = false;
-  buildDepends = [
-    filepath HTTP mtl network random stm time zlib aeson attoparsec
-    bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
-    lens optparse-applicative parallel safe shelly split
-    stringsearch syb system-fileio system-filepath tar terminfo text-binary
-    unordered-containers vector wl-pprint-text yaml
-    alex happy git gnumake autoconf automake libtool patch gmp
-    base16-bytestring cryptohash executable-path haddock-api
-    transformers-compat QuickCheck haddock hspec xhtml
-    regex-posix libiconv
-  ];
-  buildTools = [ nodejs git ];
-  testDepends = [
-    HUnit test-framework test-framework-hunit
-  ];
-  patches = [ ./ghcjs.patch ];
-  postPatch = ''
-    substituteInPlace Setup.hs \
-      --replace "/usr/bin/env" "${coreutils}/bin/env"
-
-    substituteInPlace src/Compiler/Info.hs \
-      --replace "@PREFIX@" "$out"          \
-      --replace "@VERSION@" "${version}"
-
-    substituteInPlace src-bin/Boot.hs \
-      --replace "@PREFIX@" "$out"     \
-      --replace "@CC@"     "${stdenv.cc}/bin/cc"
-  '';
-  preBuild = ''
-    export HOME="$TMP"
-
-    local topDir=$out/lib/ghcjs-${version}
-    mkdir -p $topDir
-
-    cp -r ${ghcjsBoot} $topDir/ghcjs-boot
-    chmod -R u+w $topDir/ghcjs-boot
-
-    cp -r ${shims} $topDir/shims
-    chmod -R u+w $topDir/shims
-
-    # Make the patches be relative their corresponding package's directory.
-    # See: https://github.com/ghcjs/ghcjs-boot/pull/12
-    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
-      echo "fixing patch: $patch"
-      sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
-    done
-  '';
-  # We build with --quick so we can build stage 2 packages separately.
-  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
-  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
-  postInstall = ''
-    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
-      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
-        --dev \
-        --quick \
-        --with-cabal ${cabal-install}/bin/cabal \
-        --with-gmp-includes ${gmp.dev}/include \
-        --with-gmp-libraries ${gmp.out}/lib
-  '';
-  passthru = let
-    ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
-      generated = ./node-packages-generated.nix;
-      self = ghcjsNodePkgs;
-    };
-  in {
-    inherit bootPkgs;
-    isCross = true;
-    isGhcjs = true;
-    inherit nodejs ghcjsBoot;
-    inherit (ghcjsNodePkgs) "socket.io";
-
-    # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
-    # It can be generated with the command:
-    # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/      \"\1\"/'"
-    stage1Packages = [
-      "array"
-      "base"
-      "binary"
-      "rts"
-      "bytestring"
-      "containers"
-      "deepseq"
-      "directory"
-      "filepath"
-      "ghc-prim"
-      "ghcjs-prim"
-      "integer-gmp"
-      "old-locale"
-      "pretty"
-      "primitive"
-      "process"
-      "template-haskell"
-      "time"
-      "transformers"
-      "unix"
-    ];
-
-    mkStage2 = import ./stage2.nix {
-      inherit ghcjsBoot;
-    };
+  ghcjsBootSrc = fetchgit {
+    url = git://github.com/ghcjs/ghcjs-boot.git;
+    rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
+    sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
+    fetchSubmodules = true;
   };
 
-  homepage = "https://github.com/ghcjs/ghcjs";
-  description = "A Haskell to JavaScript compiler that uses the GHC API";
-  license = stdenv.lib.licenses.bsd3;
-  platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-})
+  shims = import ./head_shims.nix { inherit fetchFromGitHub; };
+  stage1Packages = [
+    "array"
+    "base"
+    "binary"
+    "bytestring"
+    "containers"
+    "deepseq"
+    "directory"
+    "filepath"
+    "ghc-boot"
+    "ghc-boot-th"
+    "ghc-prim"
+    "ghci"
+    "ghcjs-prim"
+    "ghcjs-th"
+    "integer-gmp"
+    "pretty"
+    "primitive"
+    "process"
+    "rts"
+    "template-haskell"
+    "time"
+    "transformers"
+    "unix"
+  ];
+  stage2 = import ./head_stage2.nix;
+}
diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix
index e321978f0bdc..68b03d057397 100644
--- a/pkgs/development/compilers/ghcjs/head_shims.nix
+++ b/pkgs/development/compilers/ghcjs/head_shims.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "ghcjs";
   repo = "shims";
-  rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37";
-  sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws";
+  rev = "f67394c559ac921a768b12f141499119563b8bf3";
+  sha256 = "1lz86qmkxkfch1yk9a62admw7jsd34sqcrskgpq28hbhjpgzf1lv";
 }
diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
new file mode 100644
index 000000000000..765a384bf634
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -0,0 +1,345 @@
+{ ghcjsBoot }: { callPackage }:
+
+{
+  async = callPackage
+    ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
+      , test-framework-hunit
+      }:
+      mkDerivation {
+        pname = "async";
+        version = "2.1.0";
+        src = "${ghcjsBoot}/boot/async";
+        doCheck = false;
+        libraryHaskellDepends = [ base stm ];
+        testHaskellDepends = [
+          base HUnit test-framework test-framework-hunit
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/simonmar/async";
+        description = "Run IO operations asynchronously and wait for their results";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  aeson = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+      , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+      , stdenv, syb, tagged, template-haskell, test-framework
+      , test-framework-hunit, test-framework-quickcheck2, text, time
+      , transformers, unordered-containers, vector
+      }:
+      mkDerivation {
+        pname = "aeson";
+        version = "0.11.2.0";
+        src = "${ghcjsBoot}/boot/aeson";
+        doCheck = false;
+        libraryHaskellDepends = [
+          attoparsec base bytestring containers deepseq dlist fail ghc-prim
+          hashable mtl scientific syb tagged template-haskell text time transformers
+          unordered-containers vector
+        ];
+        testHaskellDepends = [
+          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+          template-haskell test-framework test-framework-hunit
+          test-framework-quickcheck2 text time unordered-containers vector
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/aeson";
+        description = "Fast JSON parsing and encoding";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  attoparsec = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+      , QuickCheck, quickcheck-unicode, scientific, stdenv
+      , test-framework, test-framework-quickcheck2, text, transformers
+      , vector
+      }:
+      mkDerivation {
+        pname = "attoparsec";
+        version = "0.13.0.2";
+        src = "${ghcjsBoot}/boot/attoparsec";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base bytestring containers deepseq scientific text
+          transformers
+        ];
+        testHaskellDepends = [
+          array base bytestring containers deepseq QuickCheck
+          quickcheck-unicode scientific test-framework
+          test-framework-quickcheck2 text transformers vector
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/attoparsec";
+        description = "Fast combinator parsing for bytestrings and text";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  case-insensitive = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
+      , test-framework, test-framework-hunit, text
+      }:
+      mkDerivation {
+        pname = "case-insensitive";
+        version = "1.2.0.6";
+        src = "${ghcjsBoot}/boot/case-insensitive";
+        doCheck = false;
+        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+        testHaskellDepends = [
+          base bytestring HUnit test-framework test-framework-hunit text
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/basvandijk/case-insensitive";
+        description = "Case insensitive string comparison";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  dlist = callPackage
+    ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
+      mkDerivation {
+        pname = "dlist";
+        version = "0.7.1.2";
+        src = "${ghcjsBoot}/boot/dlist";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq ];
+        testHaskellDepends = [ base Cabal QuickCheck ];
+        jailbreak = true;
+        homepage = "https://github.com/spl/dlist";
+        description = "Difference lists";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  extensible-exceptions = callPackage
+    ({ mkDerivation, base, stdenv }:
+      mkDerivation {
+        pname = "extensible-exceptions";
+        version = "0.1.1.4";
+        src = "${ghcjsBoot}/boot/extensible-exceptions";
+        doCheck = false;
+        libraryHaskellDepends = [ base ];
+        jailbreak = true;
+        description = "Extensible exceptions";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  hashable = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+      , QuickCheck, random, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2, text, unix
+      }:
+      mkDerivation {
+        pname = "hashable";
+        version = "1.2.4.0";
+        src = "${ghcjsBoot}/boot/hashable";
+        doCheck = false;
+        libraryHaskellDepends = [
+          base bytestring ghc-prim integer-gmp text
+        ];
+        testHaskellDepends = [
+          base bytestring ghc-prim HUnit QuickCheck random test-framework
+          test-framework-hunit test-framework-quickcheck2 text unix
+        ];
+        jailbreak = true;
+        homepage = "http://github.com/tibbe/hashable";
+        description = "A class for types that can be converted to a hash value";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  mtl = callPackage
+    ({ mkDerivation, base, stdenv, transformers }:
+      mkDerivation {
+        pname = "mtl";
+        version = "2.2.2";
+        src = "${ghcjsBoot}/boot/mtl";
+        doCheck = false;
+        libraryHaskellDepends = [ base transformers ];
+        jailbreak = true;
+        homepage = "http://github.com/ekmett/mtl";
+        description = "Monad classes, using functional dependencies";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  old-time = callPackage
+    ({ mkDerivation, base, old-locale, stdenv }:
+      mkDerivation {
+        pname = "old-time";
+        version = "1.1.0.3";
+        src = "${ghcjsBoot}/boot/old-time";
+        doCheck = false;
+        libraryHaskellDepends = [ base old-locale ];
+        jailbreak = true;
+        description = "Time library";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  parallel = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, stdenv }:
+      mkDerivation {
+        pname = "parallel";
+        version = "3.2.1.0";
+        src = "${ghcjsBoot}/boot/parallel";
+        doCheck = false;
+        libraryHaskellDepends = [ array base containers deepseq ];
+        jailbreak = true;
+        description = "Parallel programming library";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  scientific = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim
+      , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
+      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+      , text, vector
+      }:
+      mkDerivation {
+        pname = "scientific";
+        version = "0.3.4.7";
+        src = "${ghcjsBoot}/boot/scientific";
+        doCheck = false;
+        libraryHaskellDepends = [
+          base binary bytestring containers deepseq ghc-prim hashable
+          integer-gmp text vector
+        ];
+        testHaskellDepends = [
+          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
+          tasty-hunit tasty-quickcheck tasty-smallcheck text
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/basvandijk/scientific";
+        description = "Numbers represented using scientific notation";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  stm = callPackage
+    ({ mkDerivation, array, base, stdenv }:
+      mkDerivation {
+        pname = "stm";
+        version = "2.4.4.1";
+        src = "${ghcjsBoot}/boot/stm";
+        doCheck = false;
+        libraryHaskellDepends = [ array base ];
+        jailbreak = true;
+        description = "Software Transactional Memory";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  syb = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
+      mkDerivation {
+        pname = "syb";
+        version = "0.6";
+        src = "${ghcjsBoot}/boot/syb";
+        doCheck = false;
+        libraryHaskellDepends = [ base ];
+        testHaskellDepends = [ base containers HUnit mtl ];
+        jailbreak = true;
+        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+        description = "Scrap Your Boilerplate";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  text = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
+      , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
+      , random, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2
+      }:
+      mkDerivation {
+        pname = "text";
+        version = "1.2.2.1";
+        src = "${ghcjsBoot}/boot/text";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base binary bytestring deepseq ghc-prim integer-gmp
+        ];
+        testHaskellDepends = [
+          array base binary bytestring deepseq directory ghc-prim HUnit
+          integer-gmp QuickCheck quickcheck-unicode random test-framework
+          test-framework-hunit test-framework-quickcheck2
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/text";
+        description = "An efficient packed Unicode text type";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  unordered-containers = callPackage
+    ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
+      , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2
+      }:
+      mkDerivation {
+        pname = "unordered-containers";
+        version = "0.2.7.0";
+        src = "${ghcjsBoot}/boot/unordered-containers";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq hashable ];
+        testHaskellDepends = [
+          base ChasingBottoms containers hashable HUnit QuickCheck
+          test-framework test-framework-hunit test-framework-quickcheck2
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/tibbe/unordered-containers";
+        description = "Efficient hashing-based container types";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  vector = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
+      , random, stdenv, template-haskell, test-framework
+      , test-framework-quickcheck2, transformers
+      }:
+      mkDerivation {
+        pname = "vector";
+        version = "0.11.0.0";
+        src = "${ghcjsBoot}/boot/vector";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+        testHaskellDepends = [
+          base QuickCheck random template-haskell test-framework
+          test-framework-quickcheck2 transformers
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/haskell/vector";
+        description = "Efficient Arrays";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  ghcjs-base = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, bytestring
+      , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
+      , hashable, HUnit, integer-gmp, primitive, QuickCheck
+      , quickcheck-unicode, random, scientific, stdenv, test-framework
+      , test-framework-hunit, test-framework-quickcheck2, text, time
+      , transformers, unordered-containers, vector
+      }:
+      mkDerivation {
+        pname = "ghcjs-base";
+        version = "0.2.0.0";
+        src = "${ghcjsBoot}/ghcjs/ghcjs-base";
+        doCheck = false;
+        libraryHaskellDepends = [
+          aeson attoparsec base bytestring containers deepseq dlist ghc-prim
+          ghcjs-prim hashable integer-gmp primitive scientific text time
+          transformers unordered-containers vector
+        ];
+        testHaskellDepends = [
+          array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
+          primitive QuickCheck quickcheck-unicode random test-framework
+          test-framework-hunit test-framework-quickcheck2 text
+        ];
+        jailbreak = true;
+        homepage = "http://github.com/ghcjs/ghcjs-base";
+        description = "Base library for GHCJS";
+        license = stdenv.lib.licenses.mit;
+      }) {};
+  Cabal = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+      , deepseq, directory, extensible-exceptions, filepath, HUnit
+      , old-time, pretty, process, QuickCheck, regex-posix, stdenv
+      , test-framework, test-framework-hunit, test-framework-quickcheck2
+      , time, unix
+      }:
+      mkDerivation {
+        pname = "Cabal";
+        version = "1.24.0.0";
+        src = "${ghcjsBoot}/boot/cabal/Cabal";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base binary bytestring containers deepseq directory filepath
+          pretty process time unix
+        ];
+        testHaskellDepends = [
+          base bytestring containers directory extensible-exceptions filepath
+          HUnit old-time process QuickCheck regex-posix test-framework
+          test-framework-hunit test-framework-quickcheck2 unix
+        ];
+        jailbreak = true;
+        homepage = "http://www.haskell.org/cabal/";
+        description = "A framework for packaging Haskell software";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+}
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index e1bff12f398e..57480974a3f1 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -93,6 +93,10 @@ stdenv.mkDerivation {
     # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
     rm -vr src/test/run-pass/issue-36023.rs
 
+    # Disable test getting stuck on hydra - possible fix:
+    # https://reviews.llvm.org/rL281650
+    rm -vr src/test/run-pass/issue-36474.rs
+
     # Useful debugging parameter
     # export VERBOSE=1
   '' +
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 095555bfec40..f46735e55511 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -4,6 +4,11 @@ with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 
+  # Some Hackage packages reference this attribute, which exists only in the
+  # GHCJS package set. We provide a dummy version here to fix potential
+  # evaluation errors.
+  ghcjs-base = null;
+
   # Some packages need a non-core version of Cabal.
   cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; });
 
@@ -43,7 +48,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "0bi4ynhjx265yaryx7yd5wmwf44hav8bmhkj0knwynb6kpl92qp8";
+      sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd";
       rev = drv.version;
     };
   })).overrideScope (self: super: {
@@ -984,6 +989,25 @@ self: super: {
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
 
+  # To be in sync with Hoogle.
+  lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: {
+    patches = [
+      (pkgs.fetchpatch {
+        url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch";
+        sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf";
+        stripLen = 2;
+        addPrefixes = true;
+      })
+    ];
+
+    jailbreak = true;
+  })).override {
+    haskell-src-exts = self.haskell-src-exts-simple;
+  };
+
+  # Needs new version.
+  haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
+
   # Test suite fails a QuickCheck property.
   optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
 
@@ -1077,4 +1101,21 @@ self: super: {
   # https://github.com/josefs/STMonadTrans/issues/4
   STMonadTrans = dontCheck super.STMonadTrans;
 
+  socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
+
+  # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R"
+  ghc-core = overrideCabal super.ghc-core (drv: {
+    src = pkgs.fetchFromGitHub {
+      owner  = "shachaf";
+      repo   = "ghc-core";
+      rev    = "630196adf0bebf073328325302453ef1c409fd9a";
+      sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848";
+    };
+    version = "2012-12-15";
+  });
+
+  # Encountered missing dependencies: hspec >=1.3 && <2.1
+  # https://github.com/rampion/ReadArgs/issues/8
+  ReadArgs = doJailbreak super.ReadArgs;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c97296cd5bad..894022c176be 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -1,3 +1,7 @@
+# GHCJS package fixes
+#
+# Please insert new packages *alphabetically*
+# in the OTHER PACKAGES section.
 { pkgs }:
 
 let
@@ -9,6 +13,8 @@ with import ./lib.nix { inherit pkgs; };
 
 self: super:
 
+## GENERAL SETUP BASE PACKAGES
+
   let # The stage 1 packages
       stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null);
       # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb
@@ -47,24 +53,26 @@ self: super:
   terminfo = self.terminfo_0_4_0_1;
   xhtml = self.xhtml_3000_2_1;
 
-  pqueue = overrideCabal super.pqueue (drv: {
-    postPatch = ''
-      sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
-      sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
-      sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs
-      sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs
-      sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs
-      sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs
-    '';
-  });
 
-  transformers-compat = overrideCabal super.transformers-compat (drv: {
-    configureFlags = [];
+## OTHER PACKAGES
+
+  cereal = addBuildDepend super.cereal [ self.fail ];
+
+  entropy = overrideCabal super.entropy (old: {
+    postPatch = old.postPatch or "" + ''
+      # cabal doesn’t find ghc in this script, since it’s in the bootPkgs
+      sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \
+          -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs
+    '';
   });
 
-  profunctors = overrideCabal super.profunctors (drv: {
-    preConfigure = ''
-      sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
+  # https://github.com/kazu-yamamoto/logger/issues/97
+  fast-logger = overrideCabal super.fast-logger (old: {
+    postPatch = old.postPatch or "" + ''
+      # remove the Safe extensions, since ghcjs-boot directory
+      # doesn’t provide Trustworthy
+      sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs
+      cat System/Log/FastLogger/Date.hs
     '';
   });
 
@@ -88,16 +96,43 @@ self: super:
      }) {};
 
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
-    libraryHaskellDepends = [ self.ghcjs-base ] ++
-      removeLibraryHaskellDepends [
-        "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
-      ] drv.libraryHaskellDepends;
+    libraryHaskellDepends = with self; [
+      ghcjs-base ghcjs-dom-jsffi text transformers
+    ];
+    configureFlags = [ "-fjsffi" "-f-webkit" ];
+  });
+
+  ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
+    libraryHaskellDepends = [ self.ghcjs-base self.text ];
+    isLibrary = true;
   });
 
   ghc-paths = overrideCabal super.ghc-paths (drv: {
     patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
   });
 
+  http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
+  # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
+
+  pqueue = overrideCabal super.pqueue (drv: {
+    postPatch = ''
+      sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
+      sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
+      sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs
+      sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs
+      sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs
+      sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs
+    '';
+  });
+
+  profunctors = overrideCabal super.profunctors (drv: {
+    preConfigure = ''
+      sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
+    '';
+  });
+
+  protolude = doJailbreak super.protolude;
+
   # reflex 0.3, made compatible with the newest GHCJS.
   reflex = overrideCabal super.reflex (drv: {
     src = pkgs.fetchFromGitHub {
@@ -122,12 +157,13 @@ self: super:
       ] drv.libraryHaskellDepends;
   });
 
-  http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
-  # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
-  protolude = doJailbreak super.protolude;
   semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
+
+  transformers-compat = overrideCabal super.transformers-compat (drv: {
+    configureFlags = [];
+  });
+
   # triggers an internal pattern match failure in haddock
   # https://github.com/haskell/haddock/issues/553
   wai = dontHaddock super.wai;
-  cereal = addBuildDepend super.cereal [ self.fail ];
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1ccdbecc8d81..1958c7cc4f72 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -31,6 +31,11 @@ core-packages:
   - unix-2.7.2.0
   - xhtml-3000.2.1
 
+  # Hack: The following package is a core package of GHCJS. If we don't declare
+  # it, then hackage2nix will generate a Hackage database where all dependants
+  # if this library are maked as "broken".
+  - ghcjs-base-0
+
 default-package-overrides:
   # LTS Haskell 7.9
   - abstract-deque ==0.3
@@ -2071,7 +2076,6 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
-    - lambdabot
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -2584,6 +2588,7 @@ dont-distribute-packages:
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brick:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2672,6 +2677,7 @@ dont-distribute-packages:
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   carettah:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-core:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2945,6 +2951,7 @@ dont-distribute-packages:
   Control-Monad-ST2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   contstuff-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  convert-annotation:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   convert:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3206,11 +3213,9 @@ dont-distribute-packages:
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diff-parse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  difftodo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-foundation-lucid:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-aeson:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3843,6 +3848,14 @@ dont-distribute-packages:
   goal-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-containerbuilder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-iam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-ml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-runtimeconfig:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-safebrowsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3929,6 +3942,8 @@ dont-distribute-packages:
   gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4138,10 +4153,12 @@ dont-distribute-packages:
   haskell-tools-ast-gen:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-backend-ghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-demo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-prettyprint:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-refactor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-rewrite:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4357,6 +4374,7 @@ dont-distribute-packages:
   HGamer3D-Wire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgdbmi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGE2D:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgearman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4420,6 +4438,10 @@ dont-distribute-packages:
   HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-ui:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4432,6 +4454,7 @@ dont-distribute-packages:
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-glpk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4439,6 +4462,7 @@ dont-distribute-packages:
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4637,6 +4661,7 @@ dont-distribute-packages:
   hsparklines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-expectations-lifted:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty-diff:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4669,6 +4694,7 @@ dont-distribute-packages:
   hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstzaar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsverilog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4692,6 +4718,7 @@ dont-distribute-packages:
   http-client-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-conduit-browser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-conduit-downloader:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4901,6 +4928,7 @@ dont-distribute-packages:
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  isobmff-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4935,6 +4963,7 @@ dont-distribute-packages:
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jason:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4955,6 +4984,8 @@ dont-distribute-packages:
   js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-warp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-wkwebview:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5074,7 +5105,9 @@ dont-distribute-packages:
   lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5277,6 +5310,7 @@ dont-distribute-packages:
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5401,6 +5435,7 @@ dont-distribute-packages:
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MBot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mcmaster-gloss-examples:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5622,6 +5657,7 @@ dont-distribute-packages:
   mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-effect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysql-haskell-openssl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5823,6 +5859,7 @@ dont-distribute-packages:
   openssl-createkey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssl-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentheory-char:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opentype:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6294,6 +6331,7 @@ dont-distribute-packages:
   recursion-schemes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6375,6 +6413,8 @@ dont-distribute-packages:
   repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6460,6 +6500,7 @@ dont-distribute-packages:
   ruler-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rungekutta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  runtime-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   s-cargot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6666,6 +6707,7 @@ dont-distribute-packages:
   simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-effects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7027,6 +7069,7 @@ dont-distribute-packages:
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-discover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7038,6 +7081,7 @@ dont-distribute-packages:
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7151,6 +7195,7 @@ dont-distribute-packages:
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeconsole:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f9da4757696b..168558424641 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
 , jailbreak-cabal, hscolour, cpphs, nodePackages
-}:
+}: let isCross = (ghc.cross or null) != null; in
 
 { pname
 , dontStrip ? (ghc.isGhcjs or false)
@@ -12,13 +12,14 @@
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
 , configureFlags ? []
 , description ? ""
-, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version
+, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
 , doHoogle ? true
 , editedCabalFile ? null
 , enableLibraryProfiling ? false
 , enableExecutableProfiling ? false
-, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
-, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
+# TODO enable shared libs for cross-compiling
+, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
+, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version))
 , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
@@ -30,7 +31,8 @@
 , jailbreak ? false
 , license
 , maintainers ? []
-, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
+# TODO Do we care about haddock when cross-compiling?
+, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
@@ -57,14 +59,12 @@ let
   inherit (stdenv.lib) optional optionals optionalString versionOlder
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
-  isCross = ghc.isCross or false;
   isGhcjs = ghc.isGhcjs or false;
   packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version
                   then "package-db"
                   else "package-conf";
 
-  nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
-  nativeIsCross = nativeGhc.isCross or false;
+  nativeGhc = if isCross || isGhcjs then ghc.bootPkgs.ghc else ghc;
   nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version
                         then "package-db"
                         else "package-conf";
@@ -88,6 +88,17 @@ let
   # details are at <https://github.com/peti/ghc-library-id-bug>.
   enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary;
 
+  crossCabalFlags = [
+    "--with-ghc=${ghc.cross.config}-ghc"
+    "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg"
+    "--with-gcc=${ghc.cc}"
+    "--with-ld=${ghc.ld}"
+    "--hsc2hs-options=--cross-compile"
+  ];
+
+  crossCabalFlagsString =
+    stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
+
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
     "--with-gcc=$CC"            # Clang won't work without that extra information.
@@ -106,7 +117,9 @@ let
   ] ++ optionals isGhcjs [
     "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"
-  ];
+  ] ++ optionals isCross ([
+    "--configure-option=--host=${ghc.cross.config}"
+  ] ++ crossCabalFlags);
 
   setupCompileFlags = [
     (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
@@ -132,9 +145,9 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
   setupCommand = "./Setup";
-  ghcCommand = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;
 
 in
@@ -233,7 +246,7 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ${setupCommand} build ${buildTarget}
+    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
     runHook postBuild
   '';
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 56c84c2a7c53..e585dd64a3d0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1697,8 +1697,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.4.1";
-       sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429";
+       version = "0.8.4.2";
+       sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6062,17 +6062,20 @@ self: {
      }) {};
 
   "Gifcurry" = callPackage
-    ({ mkDerivation, base, cmdargs, directory, gtk3, process, temporary
+    ({ mkDerivation, base, cmdargs, directory, filepath, gtk3, process
+     , temporary, text
      }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "2.0.0.2";
-       sha256 = "1a7f269eda348fa34fe57f9a35cc810b304acc646f5146c4db2d72eb738c8b32";
+       version = "2.1.0.0";
+       sha256 = "51cf0949e4ea0ae9503887c0c8613d4bfee0b4bdce1d641cf0b2fd016124170c";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base directory process temporary ];
+       libraryHaskellDepends = [
+         base directory filepath process temporary text
+       ];
        executableHaskellDepends = [
-         base cmdargs directory gtk3 process temporary
+         base cmdargs directory filepath gtk3 process temporary text
        ];
        homepage = "https://github.com/lettier/gifcurry";
        description = "Create animated GIFs, overlaid with optional text, from video files";
@@ -6886,6 +6889,7 @@ self: {
        homepage = "https://github.com/I3ck/HGE2D";
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGL" = callPackage
@@ -10561,8 +10565,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lazy-Pbkdf2";
-       version = "2.1.0";
-       sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82";
+       version = "2.1.1";
+       sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base base16-bytestring binary bytestring cryptonite memory
@@ -10967,6 +10971,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -14325,15 +14330,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Rasterific_0_7" = callPackage
+  "Rasterific_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.7";
-       sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1";
+       version = "0.7.1";
+       sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef";
+       revision = "1";
+       editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -15741,8 +15748,7 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghcjs-base = null;};
+     }) {};
 
   "Spock-api-server" = callPackage
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
@@ -17956,20 +17962,20 @@ self: {
      }) {};
 
   "XSaiga" = callPackage
-    ({ mkDerivation, base, cgi, containers, hsparql, pretty, rdf4h
-     , text
+    ({ mkDerivation, base, cgi, containers, hsparql, network, pretty
+     , rdf4h, text
      }:
      mkDerivation {
        pname = "XSaiga";
-       version = "1.4.0.1";
-       sha256 = "f9eae0f1298cf4ab340b9a2761a1b4f80cffdf25a73ef8679c750008ba4316d2";
+       version = "1.5.0.0";
+       sha256 = "395e8e9710edac5a9c9355d52fc08cc293d76a6fbda12b7cc1d173d8d10f8e6c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers hsparql pretty rdf4h text
+         base containers hsparql network pretty rdf4h text
        ];
        executableHaskellDepends = [
-         base cgi containers hsparql pretty rdf4h text
+         base cgi containers hsparql network pretty rdf4h text
        ];
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
@@ -20129,8 +20135,8 @@ self: {
     ({ mkDerivation, aeson, base, json-ast }:
      mkDerivation {
        pname = "aeson-json-ast";
-       version = "0.1";
-       sha256 = "fac988efb621e4ac75269138df140dc1e1e8287c206416f2a81cd3d3b3716d9a";
+       version = "0.1.1";
+       sha256 = "ff45897bfecd8cd29c7464a60c97829361569285300bb5d30a01c97519512d5d";
        libraryHaskellDepends = [ aeson base json-ast ];
        homepage = "https://github.com/sannsyn/aeson-json-ast";
        description = "Integration layer for \"json-ast\" and \"aeson\"";
@@ -20406,8 +20412,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.11.3.1";
-       sha256 = "8d7555500b9b267eee568b04e7d1ffd58dbfd4033256347d4cc82f3a8f50a116";
+       version = "0.11.4";
+       sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e";
        libraryHaskellDepends = [
          aeson base-prelude mtl-prelude scientific success text
          unordered-containers vector
@@ -21471,8 +21477,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-seq";
-       version = "0.6.0.6";
-       sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144";
+       version = "0.6.0.7";
+       sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778";
        libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
@@ -24400,6 +24406,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amby" = callPackage
+    ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour
+     , data-default, data-default-class, either, exceptions, microlens
+     , mtl, pretty-display, process, safe, scientific, statistics
+     , vector
+     }:
+     mkDerivation {
+       pname = "amby";
+       version = "0.2.1";
+       sha256 = "2430c8d5657af53a4bcc6d7856882375f0ffbcb7c360a2b8fd23cda6e2d33ffa";
+       revision = "1";
+       editedCabalFile = "0cf317eee0251e20650218b1f54fa76513536336ad033385510b9641837ad7be";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Chart Chart-cairo Chart-diagrams colour data-default
+         data-default-class either exceptions microlens mtl pretty-display
+         process safe scientific statistics vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/jsermeno/amby#readme";
+       description = "Statistical data visualization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, csv
      , directory, filepath, graphviz, hashable, HStringTemplate, lens
@@ -26988,6 +27020,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async_2_1_1" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "async";
+       version = "2.1.1";
+       sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90";
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/simonmar/async";
+       description = "Run IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-ajax" = callPackage
     ({ mkDerivation, async, base, ghcjs-ajax, text }:
      mkDerivation {
@@ -30069,14 +30119,18 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, silently, text, turtle }:
+    ({ mkDerivation, base, criterion, optparse-applicative, silently
+     , text, turtle
+     }:
      mkDerivation {
        pname = "bench";
-       version = "1.0.1";
-       sha256 = "b90b0789604d351aa97d736492c4b10be9bebaa369efc4145579f9f6d2eeb019";
+       version = "1.0.2";
+       sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base criterion silently text turtle ];
+       executableHaskellDepends = [
+         base criterion optparse-applicative silently text turtle
+       ];
        homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
@@ -30329,8 +30383,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, time }:
      mkDerivation {
        pname = "bgmax";
-       version = "0.1.0.1";
-       sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271";
+       version = "0.2.0.0";
+       sha256 = "439458c5caab3657ce8ba8dc075097a905b4cb83f07c4a6846a248f9432ff7b8";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
@@ -30362,8 +30416,8 @@ self: {
      }:
      mkDerivation {
        pname = "bibdb";
-       version = "0.5.2";
-       sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80";
+       version = "0.5.3";
+       sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34406,6 +34460,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -37429,6 +37484,7 @@ self: {
        homepage = "https://github.com/m1dnight/carte";
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cartel" = callPackage
@@ -37486,13 +37542,13 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "3.0.0.5";
-       sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9";
+       version = "3.1.0.1";
+       sha256 = "d1ea0a6ebb07b3bdc7ac50ccf3300888b0c4d48d53640593e2748e3e1433ead4";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
        ];
-       libraryPkgconfigDepends = [ casadi ];
+       librarySystemDepends = [ casadi ];
        testHaskellDepends = [
          base containers doctest HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
@@ -37526,12 +37582,12 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "3.0.0.0";
-       sha256 = "8cd59ae975cc1de7db78ac59f6212f2523bdf723a782a9ce0c0b47922fdf31be";
+       version = "3.1.0.0";
+       sha256 = "360f2cd21f2cb418b56b9a487333b1d18dbc86def6ab659a3061080b1194e623";
        libraryHaskellDepends = [
          base casadi-bindings-internal containers vector
        ];
-       libraryPkgconfigDepends = [ casadi ];
+       librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37541,10 +37597,10 @@ self: {
     ({ mkDerivation, base, casadi, containers, vector }:
      mkDerivation {
        pname = "casadi-bindings-internal";
-       version = "0.1.4.0";
-       sha256 = "c5a48653c1f893618287adad1979ee684064daeb9b060294d65a0bea6e378976";
+       version = "0.1.5.0";
+       sha256 = "c24100f6de46d5a6ba21af67fca017ac67a7da2c945863b5d2879012c05bf35c";
        libraryHaskellDepends = [ base containers vector ];
-       libraryPkgconfigDepends = [ casadi ];
+       librarySystemDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
@@ -37968,14 +38024,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cassava-conduit_0_3_5" = callPackage
+  "cassava-conduit_0_3_5_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, mtl, QuickCheck, text
      }:
      mkDerivation {
        pname = "cassava-conduit";
-       version = "0.3.5";
-       sha256 = "0162887a9ca16d8828ac31f7c5aa409129de4e1cd3e199cd158302d3775f9e89";
+       version = "0.3.5.1";
+       sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl text
@@ -39622,6 +39678,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cielo" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, convertible, data-default
+     , hspec, http-client, http-types, lens, mtl, pretty-show
+     , QuickCheck, template-haskell, text, uuid, wreq
+     }:
+     mkDerivation {
+       pname = "cielo";
+       version = "0.1.2.0";
+       sha256 = "9c7df3e4d019a625c143f6ace77e282389651197b5d7b5fd9d502dec0ca24020";
+       libraryHaskellDepends = [
+         aeson base bytestring convertible data-default http-client
+         http-types lens mtl template-haskell text uuid wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring convertible data-default hspec http-client
+         http-types lens mtl pretty-show QuickCheck template-haskell text
+         uuid wreq
+       ];
+       homepage = "https://github.com/beijaflor-io/haskell-cielo";
+       description = "Cielo API v3 Bindings for Haskell";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "cil" = callPackage
     ({ mkDerivation, base, bytestring, language-c }:
      mkDerivation {
@@ -40345,6 +40424,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude_1_0_1" = callPackage
+    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
+     , hashable, hspec, lifted-async, lifted-base, monad-unlift
+     , mono-traversable, mono-traversable-instances, mtl
+     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
+     , semigroups, stm, stm-chans, text, time, time-locale-compat
+     , transformers, transformers-base, unordered-containers, vector
+     , vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "1.0.1";
+       sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993";
+       libraryHaskellDepends = [
+         async base basic-prelude bifunctors bytestring chunked-data
+         containers deepseq dlist exceptions ghc-prim hashable lifted-async
+         lifted-base monad-unlift mono-traversable
+         mono-traversable-instances mtl mutable-containers primitive
+         safe-exceptions say semigroups stm stm-chans text time
+         time-locale-compat transformers transformers-base
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
@@ -40367,6 +40478,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude-conduit_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "classy-prelude-conduit";
+       version = "1.0.1";
+       sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-combinators
+         monad-control resourcet transformers void
+       ];
+       testHaskellDepends = [
+         base bytestring conduit hspec QuickCheck transformers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "classy-prelude together with conduit functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-yesod" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
@@ -40387,6 +40520,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude-yesod_1_0_1" = callPackage
+    ({ mkDerivation, aeson, base, classy-prelude
+     , classy-prelude-conduit, data-default, http-conduit, http-types
+     , persistent, yesod, yesod-newsfeed, yesod-static
+     }:
+     mkDerivation {
+       pname = "classy-prelude-yesod";
+       version = "1.0.1";
+       sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53";
+       libraryHaskellDepends = [
+         aeson base classy-prelude classy-prelude-conduit data-default
+         http-conduit http-types persistent yesod yesod-newsfeed
+         yesod-static
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Provide a classy prelude including common Yesod functionality";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classyplate" = callPackage
     ({ mkDerivation, base, template-haskell, type-list }:
      mkDerivation {
@@ -41248,6 +41401,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark_0_5_4" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, text }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.4";
+       sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       homepage = "https://github.com/jgm/cmark-hs";
+       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cmark-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
      }:
@@ -41281,8 +41448,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-sections";
-       version = "0.1.0.1";
-       sha256 = "4df6ea052023b545da67a38311b69c751e1372515799b6ff88163b12f38ddf00";
+       version = "0.1.0.2";
+       sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57";
        libraryHaskellDepends = [
          base base-prelude cmark containers microlens split text
        ];
@@ -43438,6 +43605,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-combinators_1_0_8_2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, chunked-data, conduit, conduit-extra, containers
+     , directory, filepath, hspec, monad-control, mono-traversable, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
+     , text, transformers, transformers-base, unix, unix-compat, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "conduit-combinators";
+       version = "1.0.8.2";
+       sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit conduit-extra filepath monad-control mono-traversable
+         mwc-random primitive resourcet text transformers transformers-base
+         unix unix-compat vector void
+       ];
+       testHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit containers directory filepath hspec mono-traversable mtl
+         mwc-random QuickCheck safe silently text transformers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Commonly used conduit functions, for both chunked and unchunked data";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-connection" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, HUnit
      , network, resourcet, test-framework, test-framework-hunit
@@ -43999,13 +44195,13 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.1.0";
-       sha256 = "688cbecb6288c5e12c48c2bafaf27f470fe1b9d61c293b529581799cf95c7146";
+       version = "0.4.2.0";
+       sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
        ];
-       description = "Interpret the command line and settings in a config file as commands and options";
+       description = "Interpret the command line and a config file as commands and options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -44779,6 +44975,7 @@ self: {
        homepage = "http://github.com/GregorySchwartz/convert-annotation#readme";
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "convertible" = callPackage
@@ -46231,6 +46428,8 @@ self: {
        pname = "criterion";
        version = "1.1.4.0";
        sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76";
+       revision = "1";
+       editedCabalFile = "61a5386463efe3da9c0bc5d14f6074e500dc76fc62e2dda40eaf81955716fe41";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava code-page
          containers deepseq directory filepath Glob hastache js-flot
@@ -53012,7 +53211,6 @@ self: {
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "A parser for diff file formats";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diff3" = callPackage
@@ -53106,7 +53304,6 @@ self: {
        homepage = "https://github.com/jml/difftodo#readme";
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digamma" = callPackage
@@ -54675,6 +54872,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dmenu" = callPackage
+    ({ mkDerivation, base, containers, directory, lens, mtl, process
+     , transformers
+     }:
+     mkDerivation {
+       pname = "dmenu";
+       version = "0.3.0.0";
+       sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb";
+       libraryHaskellDepends = [
+         base containers directory lens mtl process transformers
+       ];
+       homepage = "https://github.com/m0rphism/haskell-dmenu";
+       description = "Complete bindings to the dmenu and dmenu2 command line tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dns" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
      , bytestring-builder, conduit, conduit-extra, containers, doctest
@@ -57428,6 +57641,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-influxdb" = callPackage
+    ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "ekg-influxdb";
+       version = "0.1.0.0";
+       sha256 = "8512eb20523c3b21811a3f61ab53ff91bfefdc8edea223bb9d9969a59c3935a4";
+       libraryHaskellDepends = [
+         base clock containers ekg-core libinfluxdb text time
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/angerman/ekg-influxdb";
+       description = "An EKG backend to send statistics to influxdb";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ekg-json" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
@@ -63191,8 +63421,8 @@ self: {
      }:
      mkDerivation {
        pname = "flaccuraterip";
-       version = "0.3.6";
-       sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da";
+       version = "0.3.7";
+       sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65414,8 +65644,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, mtl }:
      mkDerivation {
        pname = "from-sum";
-       version = "0.2.0.0";
-       sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4";
+       version = "0.2.1.0";
+       sha256 = "a1ed8a433b98df8a70be2f9199abae3e5ed7fb4c2f2b3fb1268b6b588f326667";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/cdepillabout/from-sum";
@@ -66299,8 +66529,7 @@ self: {
        homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghcjs-base = null;};
+     }) {};
 
   "g-npm" = callPackage
     ({ mkDerivation, base, HTTP, json }:
@@ -67411,15 +67640,15 @@ self: {
      }) {};
 
   "geo-uk" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, template-haskell
-     , th-lift
+    ({ mkDerivation, array, base, binary, bytestring, bzlib
+     , template-haskell, th-lift
      }:
      mkDerivation {
        pname = "geo-uk";
-       version = "0.1.0.1";
-       sha256 = "a92648834307b9ac6dde2a581fbf291b36cbd8d005965e7e64512f8bdfb01e70";
+       version = "0.1.0.2";
+       sha256 = "feb2d70452d160a342670c56eebd8f6b135d83661dfa6860cd528248fa9f27ad";
        libraryHaskellDepends = [
-         array base binary bytestring template-haskell th-lift
+         array base binary bytestring bzlib template-haskell th-lift
        ];
        homepage = "https://github.com/tolysz/geo-uk";
        description = "High precision conversion between GPS and UK Grid";
@@ -68723,11 +68952,11 @@ self: {
        homepage = "https://github.com/vwwv/ghcjs-promise";
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghcjs-base = null;};
+     }) {};
 
   "ghcjs-websockets" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary, bytestring, text
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring
+     , ghcjs-base, text
      }:
      mkDerivation {
        pname = "ghcjs-websockets";
@@ -68736,7 +68965,7 @@ self: {
        revision = "1";
        editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff";
        libraryHaskellDepends = [
-         base base64-bytestring binary bytestring text
+         base base64-bytestring binary bytestring ghcjs-base text
        ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "Deprecated: use ghcjs-base's native websockets";
@@ -69717,8 +69946,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.3.7.1";
-       sha256 = "6e30c1fff6bd5ebc5bea71307e3cc6e726d96487d1b66894e754dc90afe76831";
+       version = "0.3.7.2";
+       sha256 = "53b18bf7146c4d46347eb74a64add43167220377d75fb572afe5bb1e0ac173dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69940,8 +70169,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161111";
-       sha256 = "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45";
+       version = "6.20161118";
+       sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -70175,13 +70404,13 @@ self: {
      }:
      mkDerivation {
        pname = "git-repair";
-       version = "1.20161111";
-       sha256 = "4ce6447c2a2b678b7fd3f677aa29b8f1b018d5d11822bf5488df83e6c9cbaf54";
+       version = "1.20161118";
+       sha256 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
          base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse MissingH process unix unix-compat
+         hslogger IfElse MissingH mtl process unix unix-compat
        ];
        executableHaskellDepends = [
          async base bytestring containers directory exceptions filepath
@@ -70339,7 +70568,7 @@ self: {
      }) {};
 
   "github-backup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, MissingH
      , mtl, network, network-uri, optparse-applicative, pretty-show
      , process, text, transformers, unix, unix-compat, utf8-string
@@ -70347,11 +70576,14 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20161110";
-       sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245";
+       version = "1.20161118";
+       sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b";
        isLibrary = false;
        isExecutable = true;
-       setupHaskellDepends = [ base hslogger MissingH ];
+       setupHaskellDepends = [
+         base bytestring Cabal directory exceptions filepath hslogger IfElse
+         MissingH mtl process unix unix-compat
+       ];
        executableHaskellDepends = [
          base bytestring containers directory exceptions filepath github
          hslogger IfElse MissingH mtl network network-uri
@@ -70986,8 +71218,8 @@ self: {
        pname = "glirc";
        version = "2.20.1.1";
        sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
-       revision = "1";
-       editedCabalFile = "883328945d2ac7c7e02b70aaeb3afbe1a23032d3ba073227a56411966d3afb0b";
+       revision = "2";
+       editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -72604,6 +72836,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-core" = callPackage
@@ -72965,6 +73198,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-rules" = callPackage
@@ -73277,6 +73511,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-identity-toolkit" = callPackage
@@ -73464,6 +73699,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-monitoring" = callPackage
@@ -73876,6 +74112,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-safebrowsing" = callPackage
@@ -73888,6 +74125,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-script" = callPackage
@@ -73925,6 +74163,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicemanagement" = callPackage
@@ -73937,6 +74176,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Management SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sheets" = callPackage
@@ -74471,8 +74711,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-oauth2";
-       version = "0.2.1";
-       sha256 = "ff16b3d74d6b1d4b81dcabc07f40020d19d39c04956d0067c1fe111e9b8d14ca";
+       version = "0.2.2";
+       sha256 = "3230c41fc67242671c517e4483dfd9612f58495389ff2413f0f33444e0448058";
        libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit
        ];
@@ -74594,8 +74834,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash";
-       version = "1.2.1.0";
-       sha256 = "216c58cf971d991aedcdda7100da3dfda433371c6fa47404df9431357cd84f82";
+       version = "1.2.2.0";
+       sha256 = "4192efc2afac62ba0fb5d1b591a387e8bc4c346fdcd6ceb1f0d568cd8027cace";
        libraryHaskellDepends = [
          base containers deepseq exceptions hashable linear mtl parallel
          profunctors random semigroups time transformers
@@ -74613,8 +74853,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-actor";
-       version = "1.2.1.0";
-       sha256 = "7769718f402328fb3ae3ea268d8da5398f897cd7c3702372b8a9a1f560cc9360";
+       version = "1.2.2.0";
+       sha256 = "0de7d9391e0760193904ea91d6cc3f499a155923bc31bb9130d3fe694eda9a10";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash hashable mtl
          resourcet transformers transformers-base unordered-containers
@@ -74632,8 +74872,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-async";
-       version = "1.1.0.0";
-       sha256 = "8ed161f2d598e3f84c1ee3a2abe2ed0b8d41f4bcb526467bfbe00ba3cf6edf74";
+       version = "1.1.1.0";
+       sha256 = "ed0c0ee1404d68675b03cf133d0af8ecb9553ba2ce279e32c353db55957ebd18";
        libraryHaskellDepends = [
          async base containers deepseq exceptions gore-and-ash hashable mtl
          resourcet transformers transformers-base unordered-containers
@@ -74657,8 +74897,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-demo";
-       version = "1.1.0.0";
-       sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b";
+       version = "1.2.0.0";
+       sha256 = "73bfb46b00664c92376e3c2ffff7df7e54552b077c9c8ae146117d31d2465309";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74680,8 +74920,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-glfw";
-       version = "1.1.1.0";
-       sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c";
+       version = "1.1.2.0";
+       sha256 = "43fc8a90e985baa99334c11f48f87c166145bc9b597c7751cce0e18b282a483e";
        libraryHaskellDepends = [
          base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
          transformers unordered-containers
@@ -74691,6 +74931,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gore-and-ash-lambdacube" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-lambdacube";
+       version = "0.2.0.0";
+       sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash hashable
+         lambdacube-compiler lambdacube-gl mtl text unordered-containers
+       ];
+       homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
+       description = "Core module for Gore&Ash engine that do something";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gore-and-ash-logging" = callPackage
     ({ mkDerivation, base, containers, deepseq, exceptions, extra
      , gore-and-ash, hashable, mtl, resourcet, text, text-show
@@ -74698,8 +74956,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-logging";
-       version = "2.0.0.0";
-       sha256 = "a01fa0ba3867c791462f17f4910a155e5d814c113789b2b5d12766c399d65b93";
+       version = "2.0.1.0";
+       sha256 = "6ce12cadec13514b91593dd9cc33d3deb1cdd9bd13fec92b98d985934fa72149";
        libraryHaskellDepends = [
          base containers deepseq exceptions extra gore-and-ash hashable mtl
          resourcet text text-show transformers transformers-base
@@ -74720,8 +74978,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-network";
-       version = "1.3.2.0";
-       sha256 = "7093854a9ceb887bd7b58cad8d79d46ed632609f54bdfb2c7a2dcefe7296f4d2";
+       version = "1.4.0.0";
+       sha256 = "d1bea115605525454c300419c1860168fd38e414a3760b2f6e1ef2793f5bfece";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions extra ghc-prim
          gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network
@@ -74741,8 +74999,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-sdl";
-       version = "2.1.0.0";
-       sha256 = "2c8ec109e234cbaef34ac6b72a7a5182437a0f0473006d033cd51102d868294d";
+       version = "2.1.1.0";
+       sha256 = "8bc3bac8c1297f9110481b4fe9b75e9817952521e12af6ccfde5cd1fd589618c";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash lens linear mtl
          resourcet sdl2 text transformers transformers-base
@@ -74756,19 +75014,17 @@ self: {
   "gore-and-ash-sync" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , exceptions, gore-and-ash, gore-and-ash-actor
-     , gore-and-ash-logging, gore-and-ash-network, hashable, mtl
-     , resourcet, text, transformers, transformers-base
+     , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-sync";
-       version = "1.2.0.0";
-       sha256 = "719827da28924991b85d8d3aca1ca5fe1ebdb77d3d32154bdfc1790928015769";
+       version = "1.2.0.1";
+       sha256 = "e4c919188198e1c6740cd17f782ddb08bfac928448e84b77fba4987e94f262dc";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq exceptions gore-and-ash
          gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
-         hashable mtl resourcet text transformers transformers-base
-         unordered-containers
+         hashable mtl text unordered-containers
        ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync";
        description = "Gore&Ash module for high level network synchronization";
@@ -76131,6 +76387,7 @@ self: {
        homepage = "https://github.com/ondrap/gssapi";
        description = "libgssapi and libkrb5 bindings for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gssapi_krb5 = null; krb5 = null;};
 
   "gssapi-wai" = callPackage
@@ -76148,6 +76405,7 @@ self: {
        homepage = "https://github.com/ondrap/gssapi-wai";
        description = "WAI Middleware for SPNEGO authentiaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gstreamer" = callPackage
@@ -80699,8 +80957,10 @@ self: {
      }:
      mkDerivation {
        pname = "hashabler";
-       version = "1.3.0";
-       sha256 = "6bbd711b75f9c8fe72a1471ed99709e382ce7a58595a0088228aa39e74bf74ab";
+       version = "2.0.0";
+       sha256 = "6a2bd750238fb73bbef9572fc553aee6d0cc82326970a8598d9eb8b6ef923cf3";
+       revision = "1";
+       editedCabalFile = "c86a0c3e2fbc461ab3e75631a456f416ec9c57b7d48558ae0ad76fb4c48c3284";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
@@ -81073,6 +81333,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskelisp" = callPackage
+    ({ mkDerivation, base, containers, mtl, protolude, text }:
+     mkDerivation {
+       pname = "haskelisp";
+       version = "0.1.0.5";
+       sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949";
+       libraryHaskellDepends = [ base containers mtl protolude text ];
+       homepage = "http://github.com/githubuser/haskelisp#readme";
+       description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "haskell-aliyun" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude
      , blaze-builder, bytestring, case-insensitive, conduit, Crypto
@@ -81999,8 +82271,8 @@ self: {
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
-       version = "1.18.0.1.1";
-       sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b";
+       version = "1.19.0.0";
+       sha256 = "41bc9166e7d08bb18b5309eb2af00ce122c70eeffd047da47e9e2d9db89a2406";
        libraryHaskellDepends = [ base haskell-src-exts ];
        homepage = "https://github.com/int-e/haskell-src-exts-simple";
        description = "A simplified view on the haskell-src-exts AST";
@@ -82168,6 +82440,7 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -82281,6 +82554,7 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -86077,8 +86351,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "0.1.0.0";
-       sha256 = "fd9a5caaea40092400f6952e53cd0cda701e963732f434e14025daf683b8c4fd";
+       version = "1.0.0";
+       sha256 = "152db4b8297ed5eafb9c9f974806b39f790325b337d48e0a5724227360106b1b";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers parsec shakespeare
          template-haskell text
@@ -88296,6 +88570,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-chart" = callPackage
@@ -88315,6 +88590,7 @@ self: {
        homepage = "http://hledger.org";
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-diff" = callPackage
@@ -88350,6 +88626,25 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hledger-interest_1_5_1" = callPackage
+    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
+     }:
+     mkDerivation {
+       pname = "hledger-interest";
+       version = "1.5.1";
+       sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib mtl text time
+       ];
+       homepage = "http://github.com/peti/hledger-interest";
+       description = "computes interest for a given account";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hledger-irr" = callPackage
     ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
      , text, time
@@ -88405,8 +88700,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.0.4";
-       sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d";
+       version = "1.0.5";
+       sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88418,6 +88713,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-vty" = callPackage
@@ -88436,6 +88732,7 @@ self: {
        homepage = "http://hledger.org";
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-web" = callPackage
@@ -88781,6 +89078,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -88978,6 +89276,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap" = callPackage
@@ -92787,21 +93086,17 @@ self: {
      }) {};
 
   "hscrtmpl" = callPackage
-    ({ mkDerivation, base, directory, process, regex-compat, time
-     , time-locale-compat
-     }:
+    ({ mkDerivation, base, directory, process, time }:
      mkDerivation {
        pname = "hscrtmpl";
-       version = "1.4";
-       sha256 = "31c642da0e9c90b961160214e4a91e6aba9acbd1253eec009f4d626e360be5ab";
+       version = "1.5";
+       sha256 = "808a80880f2880432fd6c27c99aeb841d325afdad36f0aae7a5a45f512206589";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [
-         base directory process regex-compat time time-locale-compat
-       ];
+       executableHaskellDepends = [ base directory process time ];
        homepage = "http://hub.darcs.net/dino/hscrtmpl";
        description = "Haskell shell script template";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.isc;
      }) {};
 
   "hscuid" = callPackage
@@ -94002,6 +94297,7 @@ self: {
        libraryHaskellDepends = [ base hspec-expectations transformers ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -95174,6 +95470,7 @@ self: {
        ];
        description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hswip" = callPackage
@@ -96197,8 +96494,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-dispatch";
-       version = "0.6.0.0";
-       sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7";
+       version = "0.6.2.0";
+       sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive http-client
          http-client-tls http-types
@@ -96207,6 +96504,7 @@ self: {
        homepage = "http://github.com/owainlewis/http-dispatch#readme";
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-encodings" = callPackage
@@ -96477,8 +96775,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-proxy";
-       version = "0.1.0.4";
-       sha256 = "e5e582a106ead5c3a4a96fa96f95891f67714483e83154a6a3228bba41e756f4";
+       version = "0.1.0.5";
+       sha256 = "4406e4f19ae08d4d281d15a76c19c0661fcb7c5b9bf93c0f279001ac761894d8";
        libraryHaskellDepends = [
          async base blaze-builder bytestring bytestring-lexing
          case-insensitive conduit conduit-extra http-client http-conduit
@@ -99478,6 +99776,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "if" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "if";
+       version = "0.1.0.0";
+       sha256 = "28f673e867dbe0f51324d97fcb7884673a34912593746520a470116b167a141d";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/winterland1989/if";
+       description = "(?) and (?>) conditional operator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ifcxt" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
      , template-haskell
@@ -102812,24 +103122,26 @@ self: {
      }) {};
 
   "isobmff-builder" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-default, hspec
-     , singletons, tagged, text, time, type-list, type-spec
-     , vector-sized
+    ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl
+     , pretty-types, QuickCheck, singletons, tagged, template-haskell
+     , text, time, type-list, type-spec, vector
      }:
      mkDerivation {
        pname = "isobmff-builder";
-       version = "0.10.5.0";
-       sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1";
+       version = "0.11.2.0";
+       sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220";
        libraryHaskellDepends = [
-         base bytestring data-default singletons tagged text time type-list
-         type-spec vector-sized
+         base bytestring data-default mtl pretty-types singletons tagged
+         template-haskell text time type-list type-spec vector
        ];
        testHaskellDepends = [
-         base binary bytestring hspec text type-spec
+         base binary bytestring hspec mtl pretty-types QuickCheck tagged
+         text type-spec
        ];
        homepage = "https://github.com/sheyll/isobmff-builder#readme";
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isohunt" = callPackage
@@ -103439,8 +103751,8 @@ self: {
      }:
      mkDerivation {
        pname = "jack";
-       version = "0.7.1";
-       sha256 = "9a92d0482acb2647e46955d6ad73ba7cd4a148cd9f6c5263a405296b87a5afd9";
+       version = "0.7.1.1";
+       sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40";
        libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers
@@ -103622,6 +103934,7 @@ self: {
        homepage = "https://github.com/Lupino/jason#readme";
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -104214,6 +104527,7 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-wkwebview" = callPackage
@@ -104225,6 +104539,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsc" = callPackage
@@ -104586,8 +104901,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-pointer-aeson";
-       version = "0.1";
-       sha256 = "b291114509843bae81251ee517d1dad5d7c904809417b35e17cc47eec04764d4";
+       version = "0.1.1";
+       sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1";
        libraryHaskellDepends = [
          aeson base-prelude json-pointer unordered-containers vector
        ];
@@ -104806,8 +105121,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.1.2";
-       sha256 = "096be98bf0f8eb13a83388a455fc123d13c18c11a598fbde31506b610c78e976";
+       version = "0.4.1.3";
+       sha256 = "1e281cfddd1c71b40e8a4b8a75dbd0c1f16b1e349edcbc5e44e45c25241ff9dc";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -105230,6 +105545,8 @@ self: {
        pname = "jwt";
        version = "0.7.2";
        sha256 = "17967413d21399596a236bc8169d9e030bb85e2b1c349c6e470543767cc20a31";
+       revision = "1";
+       editedCabalFile = "b5858c05476741b4dc7f9f075bb8c8aca128ed25a9f325d937d370aa3d4910e1";
        libraryHaskellDepends = [
          aeson base bytestring containers cryptonite data-default http-types
          memory network-uri scientific semigroups text time
@@ -107171,7 +107488,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -107224,6 +107541,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -107446,29 +107764,23 @@ self: {
      }) {};
 
   "lambdacube-compiler" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
-     , containers, deepseq, directory, exceptions, filepath, JuicyPixels
-     , lambdacube-ir, megaparsec, monad-control, mtl
-     , optparse-applicative, patience, pretty-show, process, QuickCheck
-     , tasty, tasty-quickcheck, text, time, vect, vector, websockets
-     , wl-pprint
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
+     , containers, directory, exceptions, filepath, lambdacube-ir
+     , megaparsec, mtl, optparse-applicative, pretty-show, semigroups
+     , text, vector
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
-       version = "0.5.0.1";
-       sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564";
+       version = "0.6.0.0";
+       sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers deepseq directory exceptions filepath
-         lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint
+         aeson ansi-wl-pprint base containers directory exceptions filepath
+         lambdacube-ir megaparsec mtl pretty-show semigroups text vector
        ];
        executableHaskellDepends = [
-         aeson async base base64-bytestring bytestring containers deepseq
-         directory exceptions filepath JuicyPixels lambdacube-ir megaparsec
-         monad-control mtl optparse-applicative patience pretty-show process
-         QuickCheck tasty tasty-quickcheck text time vect vector websockets
-         wl-pprint
+         aeson base bytestring filepath optparse-applicative
        ];
        homepage = "http://lambdacube3d.com";
        description = "LambdaCube 3D is a DSL to program GPUs";
@@ -107555,8 +107867,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.5.1.1";
-       sha256 = "44fcd8abfd86607a65702caac4894114632590473bc1701f8e082966b79c63c3";
+       version = "0.5.1.2";
+       sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe";
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -107571,8 +107883,8 @@ self: {
     ({ mkDerivation, aeson, base, containers, mtl, text, vector }:
      mkDerivation {
        pname = "lambdacube-ir";
-       version = "0.3.0.0";
-       sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc";
+       version = "0.3.0.1";
+       sha256 = "1f28588141a7f2b5ac9847f2f35c8129e68273a3804748a71f06cd728fa001f7";
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
@@ -109188,6 +109500,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "leapseconds" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, time }:
+     mkDerivation {
+       pname = "leapseconds";
+       version = "1.0";
+       sha256 = "c69b5acaf60b610ac6bc68e45c1f96161b920547dc89821220b6836ba8dfd11e";
+       revision = "1";
+       editedCabalFile = "4ffceb9290e689f9b707270ab393d57dacc9c69fc880252bfed608830a0b79d8";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base tasty tasty-hunit time ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "leapseconds-announced" = callPackage
     ({ mkDerivation, base, QuickCheck, time }:
      mkDerivation {
@@ -112219,13 +112544,14 @@ self: {
      , concurrent-split, containers, data-accessor
      , data-accessor-transformers, directory, event-list
      , explicit-exception, filepath, html, httpd-shed, midi, midi-alsa
-     , network, non-empty, non-negative, parsec, pretty, process, stm
-     , stm-split, strict, transformers, unix, utility-ht, wx, wxcore
+     , network, network-uri, non-empty, non-negative, parsec, pretty
+     , process, stm, stm-split, strict, transformers, unix, utility-ht
+     , wx, wxcore
      }:
      mkDerivation {
        pname = "live-sequencer";
-       version = "0.0.5.1";
-       sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1";
+       version = "0.0.5.2";
+       sha256 = "848f38148ffbe61b0799aa471db89ade287fb06061a9b3dfbec248574dd192e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base event-list non-negative ];
@@ -112233,8 +112559,8 @@ self: {
          alsa-core alsa-seq base bytestring cgi concurrent-split containers
          data-accessor data-accessor-transformers directory
          explicit-exception filepath html httpd-shed midi midi-alsa network
-         non-empty parsec pretty process stm stm-split strict transformers
-         unix utility-ht wx wxcore
+         network-uri non-empty parsec pretty process stm stm-split strict
+         transformers unix utility-ht wx wxcore
        ];
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
@@ -113026,6 +113352,7 @@ self: {
        homepage = "https://github.com/scrive/log-utils";
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -115524,6 +115851,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "markdown_0_1_16" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , conduit, conduit-extra, containers, data-default, directory
+     , filepath, hspec, text, transformers, xml-conduit, xml-types
+     , xss-sanitize
+     }:
+     mkDerivation {
+       pname = "markdown";
+       version = "0.1.16";
+       sha256 = "08b0b352e208316ddc99c6f161704c8ecaf248c2e51f506900e344c93757ed85";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup conduit conduit-extra
+         containers data-default text transformers xml-conduit xml-types
+         xss-sanitize
+       ];
+       testHaskellDepends = [
+         base blaze-html conduit conduit-extra containers directory filepath
+         hspec text transformers
+       ];
+       homepage = "https://github.com/snoyberg/markdown";
+       description = "Convert Markdown to HTML, with XSS protection";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "markdown-kate" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html
      , conduit, containers, data-default, highlighting-kate, hspec
@@ -116470,8 +116822,8 @@ self: {
     ({ mkDerivation, base, heap, QuickCheck }:
      mkDerivation {
        pname = "median-stream";
-       version = "0.3.0.0";
-       sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74";
+       version = "0.6.0.0";
+       sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d";
        libraryHaskellDepends = [ base heap ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/caneroj1/median-stream#readme";
@@ -118410,6 +118762,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_0_9" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.0.9";
+       sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -122437,6 +122803,7 @@ self: {
        homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple" = callPackage
@@ -123806,8 +124173,7 @@ self: {
        homepage = "https://github.com/ziocroc/netwire-input-javascript";
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghcjs-base = null;};
+     }) {};
 
   "netwire-vinylglfw-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
@@ -126517,6 +126883,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "octane_0_17_0" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
+     , data-default-class, file-embed, http-client, http-client-tls
+     , overloaded-records, rattletrap, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.17.0";
+       sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bimap binary bytestring containers data-default-class
+         file-embed overloaded-records rattletrap text
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring http-client http-client-tls
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -126834,8 +127224,8 @@ self: {
      }:
      mkDerivation {
        pname = "ombra";
-       version = "0.2.0.0";
-       sha256 = "d2b256d023b9124176fc132860ba2338556ad6757ad2703bcc853d0c8bc318d9";
+       version = "0.2.1.0";
+       sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c";
        libraryHaskellDepends = [
          base gl hashable hashtables transformers unordered-containers vect
        ];
@@ -127285,8 +127675,8 @@ self: {
     ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
        pname = "opencog-atomspace";
-       version = "0.1.0.6";
-       sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a";
+       version = "0.1.0.7";
+       sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -127844,6 +128234,7 @@ self: {
        ];
        description = "Opentype loading and writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "operate-do" = callPackage
@@ -127869,10 +128260,12 @@ self: {
        pname = "operational";
        version = "0.2.3.4";
        sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810";
+       revision = "2";
+       editedCabalFile = "8cff8abd98ae819678745b9d6071c51acaa281f386a13c166ef3c27161e372f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
-       executableHaskellDepends = [ random ];
+       executableHaskellDepends = [ base random ];
        homepage = "http://wiki.haskell.org/Operational";
        description = "Implementation of difficult monads made easy with operational semantics";
        license = stdenv.lib.licenses.bsd3;
@@ -130057,12 +130450,12 @@ self: {
      }) {};
 
   "parsec-extra" = callPackage
-    ({ mkDerivation, base, monads-tf, parsec, transformers }:
+    ({ mkDerivation, base, monads-tf, parsec }:
      mkDerivation {
        pname = "parsec-extra";
-       version = "0.1.0.5";
-       sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474";
-       libraryHaskellDepends = [ base monads-tf parsec transformers ];
+       version = "0.2.0.0";
+       sha256 = "4936ab0b529d041524917304c45a140901482ba1d672d8a96c169c36e7dfc702";
+       libraryHaskellDepends = [ base monads-tf parsec ];
        description = "Some miscellaneous basic string parsers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131957,8 +132350,8 @@ self: {
     ({ mkDerivation, attoparsec, base, hspec, text }:
      mkDerivation {
        pname = "persistent-parser";
-       version = "0.1.0.1";
-       sha256 = "9ec9dda9721c20aab99ff0414c08b552c4b8893ee896460c99ae7ef960017c27";
+       version = "0.1.0.2";
+       sha256 = "124eb0c33845a823f5196f895201fceb8a99e52abc5f6197fc76b5981ff6bf77";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "Parse persistent model files";
@@ -134493,6 +134886,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "plots" = callPackage
+    ({ mkDerivation, adjunctions, base, base-orphans, colour
+     , containers, data-default, diagrams-core, diagrams-lib, directory
+     , distributive, filepath, fingertree, hashable, intervals
+     , JuicyPixels, lens, linear, monoid-extras, mtl
+     , optparse-applicative, process, profunctors, semigroupoids
+     , semigroups, split, statistics, time, transformers, vector
+     }:
+     mkDerivation {
+       pname = "plots";
+       version = "0.1.0.2";
+       sha256 = "e5c1a5f858f2bbfb531d5d0af6a070ff8fa2bd936b3a4c30b6ca65838c16b64d";
+       revision = "1";
+       editedCabalFile = "3d45b5b973339a50d0686153d77b0f1e438c1a890e75c2274830e878e9fd78d8";
+       libraryHaskellDepends = [
+         adjunctions base base-orphans colour containers data-default
+         diagrams-core diagrams-lib directory distributive filepath
+         fingertree hashable intervals JuicyPixels lens linear monoid-extras
+         mtl optparse-applicative process profunctors semigroupoids
+         semigroups split statistics time transformers vector
+       ];
+       homepage = "http://github.com/cchalmers/plots";
+       description = "Diagrams based plotting library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plotserver-api" = callPackage
     ({ mkDerivation, base, curl, split }:
      mkDerivation {
@@ -134801,6 +135220,8 @@ self: {
        pname = "pointful";
        version = "1.0.9";
        sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6";
+       revision = "1";
+       editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136863,6 +137284,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "pretty-display" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }:
+     mkDerivation {
+       pname = "pretty-display";
+       version = "0.1.9";
+       sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base pretty-show text ];
+       executableHaskellDepends = [ ansi-wl-pprint base pretty-show ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/githubuser/pretty-display#readme";
+       description = "Typeclass for human-readable display";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pretty-error" = callPackage
     ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }:
      mkDerivation {
@@ -137044,6 +137481,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive_0_6_2_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, transformers }:
+     mkDerivation {
+       pname = "primitive";
+       version = "0.6.2.0";
+       sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       testHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/haskell/primitive";
+       description = "Primitive memory-related operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "primitive-simd" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector }:
      mkDerivation {
@@ -138092,10 +138543,8 @@ self: {
     ({ mkDerivation, alsaLib, base, c2hs }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.6.4";
-       sha256 = "a0343bff81c0920c75cd24b8a5ff2d16ad0e3fdd4b285f65e611dcac0ced4f32";
-       revision = "1";
-       editedCabalFile = "44188158887c112fc181793db917e4ca4ffdb8f6889f25e36cc262aeba7877a3";
+       version = "0.6.5";
+       sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -138607,12 +139056,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20161104" = callPackage
+  "publicsuffix_0_20161116" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20161104";
-       sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4";
+       version = "0.20161116";
+       sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -139082,6 +139531,7 @@ self: {
          HUnit mtl optparse-applicative parsec process protolude silently
          stm text time transformers transformers-compat utf8-string vector
        ];
+       doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
@@ -139132,6 +139582,7 @@ self: {
          HUnit mtl optparse-applicative parsec process protolude silently
          stm text time transformers transformers-compat utf8-string vector
        ];
+       doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -141422,7 +141873,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "rasterific-svg_0_3_2" = callPackage
+  "rasterific-svg_0_3_2_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -141430,8 +141881,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.3.2";
-       sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23";
+       version = "0.3.2.1";
+       sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141655,10 +142106,8 @@ self: {
     ({ mkDerivation, base, bytestring, template-haskell, text }:
      mkDerivation {
        pname = "rawstring-qm";
-       version = "0.2.2.2";
-       sha256 = "e62f4f9bbb7e67b2cf1bf39e1765cce6ede6b9669ed17447e7531364b5307a40";
-       revision = "1";
-       editedCabalFile = "d856c4c9407a2bf37aa5c129a34109bdbeec1cecbdcd91f84be9efcb972ab954";
+       version = "0.2.3.0";
+       sha256 = "11a177bb7d685fb6a98390630196bd544e877b7460648e61a2905c21a71268fe";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
@@ -141979,8 +142428,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-balsa";
-       version = "0.2.0.1";
-       sha256 = "42ea83a158dee24bbe3a031d4222e195cf0b1844cba5b63c82173b261bfc5a71";
+       version = "0.3";
+       sha256 = "40d188ec262613a445d7e2ac06fbbd281555c45985981efe7dae45a42b83fcc0";
        libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
@@ -142140,8 +142589,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-jack";
-       version = "0.2.0.1";
-       sha256 = "8facc607ec889c7a871cd61975d7e4e0760b0064583ad1a0da938fe4fcd702cd";
+       version = "0.3";
+       sha256 = "c94b9ceda912e859146267cb418afcea0428039bffb1f8ac0ede9f2027d2645c";
        libraryHaskellDepends = [
          base containers data-accessor event-list explicit-exception
          extensible-exceptions jack midi non-negative random reactive-banana
@@ -142160,8 +142609,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-midyim";
-       version = "0.2.1";
-       sha256 = "3d8180f416b2efd948d067d9c5c1cdcb2c8b6933093435e55e02a7e63425669c";
+       version = "0.3";
+       sha256 = "dd1e2d69035249ff92d633a25d3c1393810fa5477b8e18731354be37ff558f25";
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-transformers event-list
          midi non-negative random reactive-banana transformers utility-ht
@@ -142419,6 +142868,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebindable" = callPackage
+    ({ mkDerivation, base, data-default-class, indexed }:
+     mkDerivation {
+       pname = "rebindable";
+       version = "0.1.2";
+       sha256 = "e752ad9aa91d4c96d43865c1e3eefd93c767b8765b82c77be58e4142ca8ca17d";
+       libraryHaskellDepends = [ base data-default-class indexed ];
+       homepage = "https://github.com/sleexyz/rebindable";
+       description = "A library to facilitate rebinding of Haskell syntax";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "recaptcha" = callPackage
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
@@ -142780,6 +143241,7 @@ self: {
        homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html";
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reducers" = callPackage
@@ -144992,6 +145454,7 @@ self: {
        homepage = "https://github.com/mrkkrp/req";
        description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "req-conduit" = callPackage
@@ -145012,6 +145475,7 @@ self: {
        homepage = "https://github.com/mrkkrp/req-conduit";
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reqcatcher" = callPackage
@@ -147477,6 +147941,7 @@ self: {
        homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html";
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rvar" = callPackage
@@ -148358,6 +148823,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "say" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, temporary, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "say";
+       version = "0.1.0.0";
+       sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40";
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       testHaskellDepends = [ base bytestring hspec temporary text ];
+       homepage = "https://github.com/fpco/say#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
@@ -150250,8 +150730,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, smallcheck }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.3.0.0";
-       sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec";
+       version = "0.5.3.1";
+       sha256 = "f61b090bad8407b1ba50a136a5f14fdac92e4eb69f1aa0ce2d67f318ab33df20";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest smallcheck ];
        homepage = "https://github.com/oisdk/semiring-num";
@@ -150747,6 +151227,8 @@ self: {
        pname = "serokell-util";
        version = "0.1.1.1";
        sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427";
+       revision = "1";
+       editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -150999,29 +151481,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-auth-cookie_0_4_1" = callPackage
+  "servant-auth-cookie_0_4" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring
-     , blaze-builder, blaze-html, blaze-markup, bytestring
-     , bytestring-conversion, cereal, cookie, cryptonite, data-default
-     , deepseq, exceptions, hspec, http-media, http-types, memory, mtl
-     , QuickCheck, servant, servant-blaze, servant-server, tagged, text
-     , time, transformers, wai, warp
+     , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
+     , cookie, cryptonite, data-default, deepseq, exceptions, hspec
+     , http-api-data, http-media, http-types, memory, mtl, QuickCheck
+     , servant, servant-blaze, servant-server, tagged, text, time
+     , transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.1";
-       sha256 = "d9d59d1204c372068e2de7ccf352982ba17f2dc610f9b1f0bb21048dcf346222";
+       version = "0.4";
+       sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1";
        libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring
-         bytestring-conversion cereal cookie cryptonite data-default
-         exceptions http-types memory mtl servant servant-server tagged time
-         transformers wai
+         base base64-bytestring blaze-builder bytestring cereal cookie
+         cryptonite data-default exceptions http-api-data http-types memory
+         mtl servant servant-server tagged time transformers wai
        ];
        testHaskellDepends = [
-         base base-compat blaze-html blaze-markup bytestring
-         bytestring-conversion cereal cryptonite data-default deepseq hspec
-         http-media mtl QuickCheck servant servant-blaze servant-server text
-         time wai warp
+         base base-compat blaze-html blaze-markup bytestring cereal
+         cryptonite data-default deepseq hspec http-api-data http-media mtl
+         QuickCheck servant servant-blaze servant-server text time wai warp
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
@@ -152979,6 +153459,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_11_2" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.11.2";
+       sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -153434,6 +153941,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shikensu" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow
+     , Glob, tasty, tasty-hunit, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "shikensu";
+       version = "0.1.2";
+       sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath flow Glob
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath flow tasty tasty-hunit
+         text unordered-containers
+       ];
+       homepage = "https://github.com/icidasset/shikensu#README";
+       description = "A small toolset for building static websites";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "shine" = callPackage
     ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time
      , transformers
@@ -154094,6 +154622,7 @@ self: {
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -154261,8 +154790,8 @@ self: {
     ({ mkDerivation, base, fast-logger, mtl, text }:
      mkDerivation {
        pname = "simple-logger";
-       version = "0.0.1";
-       sha256 = "01efbc3f3859deb175d157e983f3497a4db2eb00b7daf35da9431bcdf484f4eb";
+       version = "0.0.3";
+       sha256 = "5fb002bcf2eaf6aac949acea31d0ee65a08fc4d34f6baf222db4db05c8165ec1";
        libraryHaskellDepends = [ base fast-logger mtl text ];
        homepage = "https://github.com/agrafix/simple-logger#readme";
        description = "A very simple but efficient logging framework";
@@ -156953,6 +157482,8 @@ self: {
        pname = "snaplet-sqlite-simple";
        version = "1.0.0.2";
        sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7";
+       revision = "1";
+       editedCabalFile = "9c49f31dc5e4b6b10942502f2d57755fc028ff2924f2c94a32030e172d19493e";
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          lifted-base monad-control mtl snap sqlite-simple text transformers
@@ -156970,6 +157501,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "snaplet-sqlite-simple-jwt-auth" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring
+     , clientsession, containers, directory, either, errors, jwt, lens
+     , mtl, snap, snap-core, snaplet-sqlite-simple, sqlite-simple, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "snaplet-sqlite-simple-jwt-auth";
+       version = "0.1.1.0";
+       sha256 = "64afbefedfc6eda854c4b34e8bd8e69be84d2042aa81cfe0305d53ddf1b62fd2";
+       libraryHaskellDepends = [
+         aeson attoparsec base bcrypt bytestring clientsession containers
+         directory either errors jwt lens mtl snap snap-core
+         snaplet-sqlite-simple sqlite-simple text time unordered-containers
+       ];
+       homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme";
+       description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "snaplet-stripe" = callPackage
     ({ mkDerivation, base, bytestring, configurator, heist
      , lens-family-core, mtl, snap, stripe, text, text-format
@@ -157487,12 +158038,12 @@ self: {
     ({ mkDerivation, base, bytestring, lksctp-tools, socket }:
      mkDerivation {
        pname = "socket-sctp";
-       version = "0.1.0.0";
-       sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5";
+       version = "0.2.0.1";
+       sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036";
        libraryHaskellDepends = [ base bytestring socket ];
        librarySystemDepends = [ lksctp-tools ];
        testHaskellDepends = [ base bytestring socket ];
-       homepage = "https://github.com/lpeterse/haskell-socket-sctp";
+       homepage = "https://github.com/shlevy/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158754,8 +159305,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy";
-       version = "0.9.8";
-       sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a";
+       version = "0.9.9";
+       sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158792,6 +159343,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "sproxy2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, cereal, conduit, containers, cookie, docopt, entropy
+     , Glob, http-client, http-conduit, http-types
+     , interpolatedstring-perl6, network, postgresql-simple
+     , resource-pool, SHA, sqlite-simple, text, time, unix
+     , unordered-containers, wai, wai-conduit, warp, warp-tls, word8
+     , yaml
+     }:
+     mkDerivation {
+       pname = "sproxy2";
+       version = "1.90.0";
+       sha256 = "6df57f02d8002e4f80cf0531adef08b6dc112b51861c2d5dec38afefa5582ef7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring cereal
+         conduit containers cookie docopt entropy Glob http-client
+         http-conduit http-types interpolatedstring-perl6 network
+         postgresql-simple resource-pool SHA sqlite-simple text time unix
+         unordered-containers wai wai-conduit warp warp-tls word8 yaml
+       ];
+       description = "Secure HTTP proxy for authenticating users via OAuth2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "spsa" = callPackage
     ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -158972,6 +159549,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sqlite-simple_0_4_10_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "sqlite-simple";
+       version = "0.4.10.0";
+       sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-textual bytestring containers
+         direct-sqlite text time transformers
+       ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring direct-sqlite HUnit text time
+       ];
+       homepage = "http://github.com/nurpax/sqlite-simple";
+       description = "Mid-Level SQLite client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sqlite-simple-errors" = callPackage
     ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
      mkDerivation {
@@ -159298,8 +159897,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "stable-marriage";
-       version = "0.1.1.0";
-       sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2";
+       version = "0.1.2.0";
+       sha256 = "bf6e85899194446dc86b40cbfe9363dd5798a204d45f6911f98ab6ffda4fa9f6";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://github.com/cutsea110/stable-marriage";
        description = "algorithms around stable marriage";
@@ -160759,6 +161358,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-supply" = callPackage
+    ({ mkDerivation, async, base, concurrent-supply, QuickCheck, random
+     , Unique
+     }:
+     mkDerivation {
+       pname = "stm-supply";
+       version = "0.2.0.0";
+       sha256 = "f839ada6e5ac9549731086ed13fcf4c9f03a6ff93d64c0a857148820864f388c";
+       libraryHaskellDepends = [ base concurrent-supply ];
+       testHaskellDepends = [ async base QuickCheck random Unique ];
+       homepage = "https://github.com/caneroj1/stm-supply#readme";
+       description = "STM wrapper around Control.Concurrent.Supply.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stm-tlist" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -163888,6 +164502,8 @@ self: {
        pname = "system-locale";
        version = "0.1.0.0";
        sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab";
+       revision = "1";
+       editedCabalFile = "3681691c486cb637328329037f5ccb6bc266310cc4db7bb04072a7084328cfa4";
        libraryHaskellDepends = [ base megaparsec process time ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cocreature/system-locale";
@@ -164136,6 +164752,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tabl" = callPackage
+    ({ mkDerivation, base, safe, text }:
+     mkDerivation {
+       pname = "tabl";
+       version = "0.1.0.0";
+       sha256 = "4adb4507af71badd8cb5f076d8c996f9e26e8102e4c2361a93bad1ae303c9b2e";
+       libraryHaskellDepends = [ base safe text ];
+       homepage = "https://github.com/lovasko/tabl";
+       description = "Table layout";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "table" = callPackage
     ({ mkDerivation, base, csv, optparse-applicative, process, split }:
      mkDerivation {
@@ -165136,6 +165764,7 @@ self: {
        homepage = "https://github.com/lwm/tasty-discover/";
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -165656,6 +166285,7 @@ self: {
        homepage = "https://github.com/winterland1989/tcp-streams";
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdd-util" = callPackage
@@ -167588,6 +168218,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-utils" = callPackage
+    ({ mkDerivation, base, HTF, text }:
+     mkDerivation {
+       pname = "text-utils";
+       version = "0.1.0.0";
+       sha256 = "63b6e0bc28907593a5a98c5e27be3ab22b44cdb66c4095461fe4dd683f262662";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base HTF text ];
+       homepage = "https://github.com/agrafix/text-utils#readme";
+       description = "Various text utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-xml-generic" = callPackage
     ({ mkDerivation, base, bytestring, containers, haskell98, mtl
      , not-in-base, split, syb, template-haskell, xml
@@ -167972,8 +168615,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-inline-io-action";
-       version = "0.1.0.0";
-       sha256 = "8f7fa350547913e30a26930cad3560044be1f440ad0159ff19d9291bec887dfb";
+       version = "0.1.0.1";
+       sha256 = "78dae84932b62a5dd487cbcc803d519bab4ba1bec867271a234898e2fd73bd27";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/tolysz/inline-io-action";
        description = "Simple inline IO action into compiled code using TH";
@@ -168745,12 +169388,13 @@ self: {
      , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
      , mime-types, mtl, network, process, random, scientific, split
      , tasty, tasty-quickcheck, text, transformers, unordered-containers
-     , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib
+     , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad
+     , xmonad-contrib
      }:
      mkDerivation {
        pname = "tianbar";
-       version = "1.2.3.0";
-       sha256 = "d6f81bb178bf6a0f836269b13659b068c60c912f5a4d76e86be3228ca15168b3";
+       version = "1.2.4";
+       sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168762,7 +169406,7 @@ self: {
          mime-types mtl network process random scientific split text
          transformers unordered-containers utf8-string vector xdg-basedir
        ];
-       executablePkgconfigDepends = [ gtk3 ];
+       executablePkgconfigDepends = [ gtk3 webkit2gtk ];
        testHaskellDepends = [
          aeson base bytestring containers dbus directory filepath gi-gdk
          gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@@ -168774,7 +169418,7 @@ self: {
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;};
 
   "tic-tac-toe" = callPackage
     ({ mkDerivation, base, glade, gtk, haskell98 }:
@@ -169011,14 +169655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_6_0_1" = callPackage
+  "time_1_7" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck, test-framework
      , test-framework-quickcheck2, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.6.0.1";
-       sha256 = "ff69b46f38f4d226b171d078b200f8a5a1e8cfeadfa543eabade51355d7c7fcb";
+       version = "1.7";
+       sha256 = "a30e1ea20cc59f3bf6ee2d5fd0a0dfa58f1ec865681d762cf1bb1103562e2a7a";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
@@ -169307,8 +169951,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "0.1.1.1";
-       sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18";
+       version = "0.1.1.2";
+       sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169331,6 +169975,7 @@ self: {
        homepage = "https://github.com/serokell/time-warp";
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timecalc" = callPackage
@@ -174601,6 +175246,8 @@ self: {
        pname = "unix";
        version = "2.7.2.1";
        sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c";
+       revision = "1";
+       editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -175550,6 +176197,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "users-mysql-haskell" = callPackage
+    ({ mkDerivation, base, bytestring, io-streams, mysql-haskell, tasty
+     , tasty-hunit, text, time, transformers, users, uuid
+     }:
+     mkDerivation {
+       pname = "users-mysql-haskell";
+       version = "0.5.2.0";
+       sha256 = "a7f7a2d91860e2dc4594639776aaff06c981f01aaa356553c397d50a0f367930";
+       libraryHaskellDepends = [
+         base io-streams mysql-haskell text time transformers users uuid
+       ];
+       testHaskellDepends = [
+         base bytestring io-streams mysql-haskell tasty tasty-hunit text
+         time transformers users uuid
+       ];
+       description = "A mysql-haskell backend for the users library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "users-persistent" = callPackage
     ({ mkDerivation, base, bytestring, esqueleto, hspec, monad-logger
      , mtl, persistent, persistent-sqlite, persistent-template
@@ -176727,8 +177393,8 @@ self: {
        pname = "vector";
        version = "0.11.0.0";
        sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4";
-       revision = "1";
-       editedCabalFile = "dfdf3252519ff35da59f977b7d37d6c5a6660673ce1234899af0111f7ece9c66";
+       revision = "2";
+       editedCabalFile = "2bfafd758ab4d80fa7a16b0a650aff60fb1be109728bed6ede144baf1f744ace";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
@@ -177227,12 +177893,12 @@ self: {
     ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers
      , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl
      , pipes, pipes-concurrency, process, QuickCheck, stm, tasty
-     , tasty-quickcheck, template-haskell, text, transformers, unix, vty
+     , tasty-quickcheck, text, transformers, unix, vty
      }:
      mkDerivation {
        pname = "vgrep";
-       version = "0.1.4.0";
-       sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b";
+       version = "0.1.4.1";
+       sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177241,7 +177907,7 @@ self: {
        ];
        executableHaskellDepends = [
          async base cabal-file-th containers directory lens mtl pipes
-         pipes-concurrency process template-haskell text unix vty
+         pipes-concurrency process text unix vty
        ];
        testHaskellDepends = [
          base containers doctest lens QuickCheck tasty tasty-quickcheck text
@@ -177841,7 +178507,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_12" = callPackage
+  "vty_5_13" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , data-default, deepseq, directory, filepath, hashable, HUnit
      , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
@@ -177852,8 +178518,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.12";
-       sha256 = "999cc0c66a6e08cada8810f91b0f08e33282361cc01182ea3774e96b13642a56";
+       version = "5.13";
+       sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178286,8 +178952,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-frontend-monadcgi";
-       version = "3.0.0.2";
-       sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91";
+       version = "3.0.0.3";
+       sha256 = "b140ad372252e638dfa7a8d8d48ae84121b1b67dc6454801302a15bd8cf42729";
        libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
@@ -181491,8 +182157,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, hspec, time }:
      mkDerivation {
        pname = "workdays";
-       version = "0.1.0";
-       sha256 = "61c41d0b6257630ed2e9b484264a8f0c19595e6f0bf1c30dd35129951bd4a4de";
+       version = "0.1.1";
+       sha256 = "871cf67b17ca57f91ce73295311e4ffa5f6c8301908cbd182d6b7c50d48289e7";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers doctest hspec ];
        homepage = "https://github.com/stackbuilders/workdays";
@@ -182959,7 +183625,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xml-conduit_1_4_0_1" = callPackage
+  "xml-conduit_1_4_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -182967,8 +183633,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.4.0.1";
-       sha256 = "7c9c171230bcb66b1ab6b0b201f6e5666c79ad4eb0747e68eb1d932591ab1700";
+       version = "1.4.0.2";
+       sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -185782,8 +186448,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.11.1";
-       sha256 = "76ce2fbc55ed6e23c70fea32441c38a6466888695b8c48035471343c407efd2f";
+       version = "0.11.2";
+       sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 66e151aefe3c..7929d99de153 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -47,7 +47,10 @@ let
 in
 if paths == [] && !withLLVM then ghc else
 buildEnv {
-  inherit (ghc) name;
+  # this makes computing paths from the name attribute impossible;
+  # if such a feature is needed, the real compiler name should be saved
+  # as a dedicated drv attribute, like `compiler-name`
+  name = ghc.name + "-with-packages";
   paths = paths ++ [ghc];
   inherit ignoreCollisions;
   postBuild = ''
diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix
new file mode 100644
index 000000000000..cbb5f0789fa2
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix
@@ -0,0 +1,98 @@
+{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang
+, gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
+, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
+, enableDebugInfo ? false 
+, Carbon ? null, Cocoa ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
+assert odbcSupport -> unixODBC != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}";
+  version = "16B03-1";
+
+  src = fetchgit {
+    url = "https://github.com/basho/otp";
+    rev = "cb3a485894e493ad172db2749129e613fe52713a";
+    sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655";
+  };
+
+  debugInfo = enableDebugInfo;
+
+  buildInputs =
+    [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc 
+    ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
+      ++ optional odbcSupport [ unixODBC ];
+
+  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
+
+  preConfigure = ''
+    export HOME=$PWD/../
+    export LANG=C
+    export ERL_TOP=$(pwd)
+    sed -e s@/bin/pwd@pwd@g -i otp_build
+    sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc 
+  '';
+
+  configureFlags= [
+    "--with-ssl=${openssl.dev}"
+    "--enable-smp-support" 
+    "--enable-threads" 
+    "--enable-kernel-poll" 
+    "--disable-hipe" 
+    "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" 
+    "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" 
+    "${optionalString stdenv.isLinux "--enable-m64-build"}"
+  ];
+
+  buildPhase = ''
+    ./otp_build autoconf 
+    ./otp_build setup -a --prefix=$out $configureFlags
+  '';
+
+  postInstall = let
+    manpages = fetchurl {
+      url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
+      sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g";
+    };
+  in ''
+    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+    tar xf "${manpages}" -C "$out/lib/erlang"
+    for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
+      prefix="''${i%/*}"
+      ensureDir "$out/share/man/''${prefix##*/}"
+      ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
+    done
+  '';
+
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = "https://github.com/basho/otp/";
+    description = "Programming language used for massively scalable soft real-time systems, Basho fork";
+
+    longDescription = ''
+      Erlang is a programming language used to build massively scalable
+      soft real-time systems with requirements on high availability.
+      Some of its uses are in telecoms, banking, e-commerce, computer
+      telephony and instant messaging. Erlang's runtime system has
+      built-in support for concurrency, distribution and fault
+      tolerance.
+      This version of Erlang is Basho's version, forked from Ericsson's 
+      repository.
+    '';
+
+    platforms = ["x86_64-linux" "x86_64-darwin"];
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with maintainers; [ mdaiter ];
+  };
+}
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 56b4626a2127..57323a587f81 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -6,6 +6,7 @@
 , javacSupport ? false, openjdk ? null
 , enableHipe ? true
 , enableDebugInfo ? false
+, enableDirtySchedulers ? false
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
   configureFlags= [
     "--with-ssl=${openssl.dev}"
   ] ++ optional enableHipe "--enable-hipe"
+    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
     ++ optional wxSupport "--enable-wx"
     ++ optional odbcSupport "--with-odbc=${unixODBC}"
     ++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 5d9c5dac3d8e..f9b6edc3fa4b 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -6,6 +6,7 @@
 , javacSupport ? false, openjdk ? null
 , enableHipe ? true
 , enableDebugInfo ? false
+, enableDirtySchedulers ? false
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -20,7 +21,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
   + "${optionalString javacSupport "-javac"}";
-  version = "18.3.4";
+  version = "18.3.4.4";
 
   # Minor OTP releases are not always released as tarbals at
   # http://erlang.org/download/ So we have to download from
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = "otp";
     rev = "OTP-${version}";
-    sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h";
+    sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk";
   };
 
   buildInputs =
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
   configureFlags= [
     "--with-ssl=${openssl.dev}"
   ] ++ optional enableHipe "--enable-hipe"
+    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
     ++ optional wxSupport "--enable-wx"
     ++ optional odbcSupport "--with-odbc=${unixODBC}"
     ++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index ddeccb29b59d..824c68688803 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -6,6 +6,7 @@
 , javacSupport ? false, openjdk ? null
 , enableHipe ? true
 , enableDebugInfo ? false
+, enableDirtySchedulers ? false
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -20,7 +21,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
   + "${optionalString javacSupport "-javac"}";
-  version = "19.1";
+  version = "19.1.6";
 
   # Minor OTP releases are not always released as tarbals at
   # http://erlang.org/download/ So we have to download from
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = "otp";
     rev = "OTP-${version}";
-    sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736";
+    sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y";
   };
 
   buildInputs =
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
   configureFlags= [
     "--with-ssl=${openssl.dev}"
   ] ++ optional enableHipe "--enable-hipe"
+    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
     ++ optional wxSupport "--enable-wx"
     ++ optional odbcSupport "--with-odbc=${unixODBC}"
     ++ optional javacSupport "--with-javac"
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 78d154bb6542..a883080f58e7 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv";
+    sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 96c85704f5ef..3b1b288fd5d5 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -302,12 +302,12 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.27";
-    sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv";
+    version = "5.6.28";
+    sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5";
   };
 
   php70 = generic {
-    version = "7.0.12";
-    sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q";
+    version = "7.0.13";
+    sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h";
   };
 }
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
deleted file mode 100644
index 24ba479186ec..000000000000
--- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, readline, nspr }:
-
-stdenv.mkDerivation rec {
-  version = "1.8.0-rc1";
-  name = "spidermonkey-${version}";
-
-  src = fetchurl {
-    url = "mirror://mozilla/js/js-${version}.tar.gz";
-    sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413";
-  };
-
-  buildInputs = [ readline nspr ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/src";
-
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.isi686 "pic";
-
-  makefileExtra = ./Makefile.extra;
-  makefile = "Makefile.ref";
-
-  patchPhase =
-    ''
-      cat ${makefileExtra} >> ${makefile}
-      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
-    '';
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-  '';
-
-  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1";
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
index 721aff154e37..721aff154e37 100644
--- a/pkgs/development/interpreters/spidermonkey/arm-flags.patch
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch
diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
index f6dab5497a0a..f6dab5497a0a 100644
--- a/pkgs/development/interpreters/spidermonkey/findvanilla.patch
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 582e7039d17c..3c5eef01db01 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,11 +1,11 @@
-{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
+{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation rec {
-  version = "185-1.0.0";
   name = "spidermonkey-${version}";
+  version = "1.8.5";
 
   src = fetchurl {
-    url = "mirror://mozilla/js/js${version}.tar.gz";
+    url = "mirror://mozilla/js/js185-1.0.0.tar.gz";
     sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
   };
 
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
-    ${if stdenv.isArm then "autoreconf --verbose --force" else ""}
+    ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
   '';
 
   patches = stdenv.lib.optionals stdenv.isArm [
     # Explained below in configureFlags for ARM
-    ./findvanilla.patch
+    ./1.8.5-findvanilla.patch
     # Fix for hard float flags.
-    ./arm-flags.patch
+    ./1.8.5-arm-flags.patch
   ];
 
   patchFlags = "-p3";
diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.nix
index a2ecfb2ef97a..a2ecfb2ef97a 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.nix
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.nix
index 279528e9e83c..6e354c542963 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:
 
 stdenv.mkDerivation rec {
   version = "24.2.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline ];
+  buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];
 
   postPatch = ''
     # Fixes an issue with version detection under perl 5.22.x
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     "--libdir=$(lib)/lib"
     "--includedir=$(dev)/include"
     "--enable-threadsafe"
+    "--with-system-icu"
     "--with-system-nspr"
     "--with-system-ffi"
     "--enable-readline"
diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.nix
index f52d526e3fa9..585ebc120d8e 100644
--- a/pkgs/development/interpreters/spidermonkey/31.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/31.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }:
 
 stdenv.mkDerivation rec {
   version = "31.5.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
   };
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline ];
+  buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-threadsafe"
     "--with-system-ffi"
+    "--with-system-nspr"
+    "--with-system-icu"
     "--enable-readline"
 
     # enabling these because they're wanted by 0ad. They may or may
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
new file mode 100644
index 000000000000..89c02f262001
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
+
+stdenv.mkDerivation rec {
+  version = "38.2.1.rc0";
+  name = "spidermonkey-${version}";
+
+  # the release notes point to some guys home directory, see
+  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
+  # probably it would be more ideal to pull a particular tag/revision
+  # from the mercurial repo
+  src = fetchurl {
+    url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2";
+    sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
+  };
+
+  buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export CXXFLAGS="-fpermissive"
+    export LIBXUL_DIST=$out
+    export PYTHON="${python2.interpreter}"
+  '';
+
+  configureFlags = [
+    "--enable-threadsafe"
+    "--with-system-ffi"
+    "--with-system-nspr"
+    "--with-system-zlib"
+    "--with-system-icu"
+    "--enable-readline"
+
+    # enabling these because they're wanted by 0ad. They may or may
+    # not be good defaults for other uses.
+    "--enable-gcgenerational"
+    "--enable-shared-js"
+  ];
+
+  # This addresses some build system bug. It's quite likely to be safe
+  # to re-enable parallel builds if the source revision changes.
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    # The headers are symlinks to a directory that doesn't get put
+    # into $out, so they end up broken. Fix that by just resolving the
+    # symlinks.
+    for i in $(find $out -type l); do
+      cp --remove-destination "$(readlink "$i")" "$i";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+
+    maintainers = [ maintainers.abbradar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra
deleted file mode 100644
index a764cfc69cb6..000000000000
--- a/pkgs/development/interpreters/spidermonkey/Makefile.extra
+++ /dev/null
@@ -1,10 +0,0 @@
-install: $(PROGRAM) $(SHARED_LIBRARY)
-	mkdir -pv $(DIST)/{bin,lib}
-	mkdir -pv $(DIST)/include
-	cp -v $(PROGRAM) $(DIST)/bin
-	cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib
-	cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include
-	mkdir -pv $(DIST)/include/js
-	find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';'
-	find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';'
-
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
deleted file mode 100644
index 1fe4b90b2b80..000000000000
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, readline }:
-
-stdenv.mkDerivation rec {
-  name = "spidermonkey-1.7";
-
-  src = fetchurl {
-    url = mirror://mozilla/js/js-1.7.0.tar.gz;
-    sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
-  };
-
-  hardeningDisable = [ "format" ]
-    ++ stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  buildInputs = [ readline ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/src";
-
-  makefileExtra = ./Makefile.extra;
-  makefile = "Makefile.ref";
-
-  patchPhase =
-    ''
-      cat ${makefileExtra} >> ${makefile}
-      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
-    '';
-
-  CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8";
-
-  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
-
-  meta = with stdenv.lib; {
-    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
-    license = licenses.mpl20;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index a10d730d06e4..e1cfb488be88 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd";
   };
 
+  outputs = [ "out" "dev" ];
+
   propagatedBuildInputs = [ atk glibmm ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index fbf3cd57e3b9..017516f6b490 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ cairo libsigcxx ];
   buildInputs = [ fontconfig freetype ]
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 3b015532ca8b..feb769229c02 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.2";
+  version = "3.2.1";
   name = "glfw-${version}";
 
   src = fetchFromGitHub {
     owner = "glfw";
     repo = "GLFW";
     rev = "${version}";
-    sha256 = "0knqf40jij2z1mia091xqyky5r11r4qyh7b8172blrmgm9q23sl9";
+    sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a91acdbb0086..4e18e4d16b2c 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -14,7 +14,7 @@ let
   inherit (stdenv.lib) optional optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.8.2";
+  name = "gst-plugins-bad-1.10.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97";
+    sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 00aa893bd33e..319f7c75a750 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.8.2";
+  name = "gst-plugins-base-1.10.1";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d";
+    sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index da6a8c7a74a4..55da05c4c971 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.8.2";
+  name = "gstreamer-1.10.1";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341";
+    sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 5f60b9c03a31..06776de9340c 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.8.2";
+  name = "gstreamer-editing-services-1.10.1";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae";
+    sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a44bdbcd08c4..ba6f79c138ab 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -10,7 +10,7 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.8.2";
+  name = "gst-plugins-good-1.10.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944";
+    sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 176e19000e91..a1e28efbff46 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }:
 
 let
-  ver_maj = "1.4";
-  ver_min = "3";
+  ver_maj = "1.8";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "gstreamermm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
-    sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi";
+    sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 788aacf03ec6..7ae10f50c4d6 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.8.2";
+  name = "gst-libav-1.10.1";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a";
+    sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 9d6fa94cf3ae..78127e3ce98a 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -6,14 +6,14 @@
 let
   inherit (pythonPackages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "gst-python-1.8.2";
+  name = "gst-python-1.10.1";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g";
+    sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index ab6e1f9f4f17..df5b682a2371 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.8.2";
+  name = "gst-plugins-ugly-1.10.1";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac";
+    sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 9972468f1b7f..f18b9fc214dc 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,24 +1,25 @@
 { stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
 , libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
-, libvpx
+, libvpx, python
 }:
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "0.7.0";
+  version = "1.10.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
-    sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
+    url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
+    sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
+  nativeBuildInputs = [ pkgconfig bzip2 ];
 
   buildInputs = [
     gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
-    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx
+    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM
+    xorg.libICE mesa nasm libvpx python
   ];
 
   preConfigure = "
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
 
   meta = {
-    homepage = "http://www.freedesktop.org";
+    homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 2de3955ab06a..2f5ba2372ce7 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
-, python, gobjectIntrospection
+, python, gobjectIntrospection, json_glib
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.8.2";
+  name = "gst-validate-1.10.1";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe";
+    sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7";
   };
 
   outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python
+    python json_glib
   ];
 
   propagatedBuildInputs = [ gstreamer gst-plugins-base ];
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 119e3f77f670..1ec2a7cd6f0d 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [pkgconfig];
 
   propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 8b2383f33cce..49055f6b4a95 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ epoxy ];
 
diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix
deleted file mode 100644
index 9453aa0635c7..000000000000
--- a/pkgs/development/libraries/java/shared-objects/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, jdk}:
-
-stdenv.mkDerivation {
-  name = "shared-objects-1.4";
-  src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz;
-    md5 = "c1f2c58bd1a07be32da8a6b89354a11f";
-  };
-  buildInputs = [stdenv jdk];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 4b214c37a698..397d59f8b246 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -56,20 +56,15 @@ let
         } // (args.meta or {});
       });
 
-    kdeEnv = import ./kde-env.nix {
-      inherit (pkgs) stdenv lib;
-      inherit (pkgs.xorg) lndir;
-    };
-
     kdeWrapper = import ./kde-wrapper.nix {
       inherit (pkgs) stdenv lib makeWrapper;
-      inherit kdeEnv;
     };
 
     attica = callPackage ./attica.nix {};
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};
     breeze-icons = callPackage ./breeze-icons.nix {};
+    # FIXME: this collides with the "ecm" package.
     ecm =
       let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
             makeSetupHook
diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix
deleted file mode 100644
index 5ddf89a0129f..000000000000
--- a/pkgs/development/libraries/kde-frameworks/kde-env.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, lib, lndir }:
-
-drv: pkgs:
-
-stdenv.mkDerivation {
-  name = "kde-env-${drv.name}";
-  nativeBuildInputs = [ lndir ];
-  envPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
-  unpackPhase = "true";
-  configurePhase = "runHook preConfigure; runHook postConfigure";
-  buildPhase = "true";
-  installPhase = ''
-    runHook preInstall
-
-    propagated=""
-    for i in $envPkgs; do
-        findInputs $i propagated propagated-user-env-packages
-    done
-
-    for tgt in bin etc/xdg lib/libexec lib/qt5 share; do
-        mkdir -p "$out/$tgt"
-        for p in $propagated; do
-            if [ -d "$p/$tgt" ]; then
-                lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1
-            fi
-        done
-    done
-
-    runHook postInstall
-  '';
-}
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 153ca31fd625..3591e20d11fb 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -1,17 +1,14 @@
-{ stdenv, lib, makeWrapper, kdeEnv }:
+{ stdenv, lib, makeWrapper }:
 
 drv:
 
 { targets, paths ? [] }:
 
-let
-  env = kdeEnv drv paths;
-in
 stdenv.mkDerivation {
-  inherit (drv) name;
+  inherit (drv) name meta;
 
-  drv = lib.getBin drv;
-  inherit env targets;
+  paths = builtins.map lib.getBin ([drv] ++ paths);
+  inherit drv targets;
   passthru = { unwrapped = drv; };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -21,16 +18,36 @@ stdenv.mkDerivation {
   buildPhase = "true";
 
   installPhase = ''
+    propagated=
+    for p in $drv $paths; do
+        findInputs $p propagated propagated-user-env-packages
+    done
+
+    wrap_PATH="$out/bin"
+    wrap_XDG_DATA_DIRS=
+    wrap_XDG_CONFIG_DIRS=
+    wrap_QML_IMPORT_PATH=
+    wrap_QML2_IMPORT_PATH=
+    wrap_QT_PLUGIN_PATH=
+    for p in $propagated; do
+        addToSearchPath wrap_PATH "$p/bin"
+        addToSearchPath wrap_XDG_DATA_DIRS "$p/share"
+        addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg"
+        addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports"
+        addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml"
+        addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins"
+    done
+
     for t in $targets; do
         if [ -a "$drv/$t" ]; then
             makeWrapper "$drv/$t" "$out/$t" \
                 --argv0 '"$0"' \
-                --suffix PATH : "$out/bin:$env/bin" \
-                --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
-                --prefix XDG_DATA_DIRS : "$env/share" \
-                --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
-                --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
-                --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+                --suffix PATH : "$wrap_PATH" \
+                --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \
+                --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \
+                --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \
+                --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \
+                --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH"
         else
             echo "no such file or directory: $drv/$t"
             exit 1
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 2158f26f2859..61fb8f2ffd86 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "1lyxlras357p17vbwfhwny69izjx74xncaxpyk1n4d2jbsvjspfr";
+    url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
+    sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix
new file mode 100644
index 000000000000..e5406d3a2a58
--- /dev/null
+++ b/pkgs/development/libraries/libktorrent/5.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, ecm
+, karchive, kcrash, ki18n, kio, solid
+, boost, gmp, qca-qt5, libgcrypt
+}:
+
+stdenv.mkDerivation rec {
+  name = "libktorrent-2.0.1";
+
+  src = fetchurl {
+    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
+    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake ecm ];
+  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
+
+  propagatedBuildInputs = [ gmp boost ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A BitTorrent library used by KTorrent";
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index db07775d45ed..9e7fb0a0b3d5 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "A BiTtorrent library used by KTorrent";
+    description = "A BitTorrent library used by KTorrent";
     homepage = http://ktorrent.pwsp.net;
     inherit (kdelibs.meta) platforms;
   };
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 4c9733c6a5e5..36c486ce53d2 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-0.4.11";
-  src = fetchurl {
-    url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
+  name = "libproxy-${version}";
+  version = "0.4.13";
+
+  src = fetchFromGitHub {
+    owner = "libproxy";
+    repo = "libproxy";
+    rev = version;
+    sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
@@ -14,7 +18,10 @@ stdenv.mkDerivation rec {
     # now some optional deps, but many more are possible
     ++ [ glib ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+    homepage = "http://libproxy.github.io/libproxy/";
+    description = "A library that provides automatic proxy configuration management";
   };
 }
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index e9b08609f23c..646fdfbac4f3 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libxml++-${maj_ver}.${min_ver}";
   maj_ver = "3.0";
-  min_ver = "0";
+  min_ver = "1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
-    sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg";
+    sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index b6d187e7a0ed..9b2fd805c319 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
 
-let name = "menu-cache-1.0.1";
+let name = "menu-cache-1.0.2";
 in
 stdenv.mkDerivation {
   inherit name;
   src = fetchurl {
     url = "mirror://sourceforge/lxde/${name}.tar.xz";
-    sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa";
+    sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e923f87722ae..2b31405980b0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -132,12 +132,17 @@ stdenv.mkDerivation {
       $out/lib/vdpau         \
       $out/lib/bellagio      \
       $out/lib/libxatracker* \
-      $out/lib/libvulkan_* \
+      $out/lib/libvulkan_*
 
     # move share/vulkan/icd.d/
     mv $out/share/ $drivers/
+    # Update search path used by Vulkan (it's pointing to $out but
+    # drivers are in $drivers)
+    for js in $drivers/share/vulkan/icd.d/*.json; do
+      substituteInPlace "$js" --replace "$out" "$drivers"
+    done
 
-    mv $out/lib/dri/* $drivers/lib/dri
+    mv $out/lib/dri/* $drivers/lib/dri # */
     rmdir "$out/lib/dri"
 
     # move libOSMesa to $osmesa, as it's relatively big
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 53b2b6358649..35f675a305af 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ netcdf hdf5 curl gfortran ];
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fortran API to manipulate netcdf files";
-    homepage = "http://www.unidata.ucar.edu/software/netcdf/";
-    license = stdenv.lib.licenses.free;
-    maintainers = stdenv.lib.maintainers.bzizou;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://www.unidata.ucar.edu/software/netcdf/;
+    license = licenses.free;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 6850c13b44e9..b99498f2013e 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pango glibmm cairomm ];
 
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index ab1943b85909..ff67ff8a1bbf 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17
 , gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412
 , useSystemd ? stdenv.isLinux, systemd }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
   buildInputs =
-    [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
+    [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
     ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
     ++ stdenv.lib.optional useSystemd systemd;
 
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 0e40a7ac96d2..8b4e924a7339 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -106,7 +106,7 @@ let
         qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
         qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
         qtsensors qtserialport qtsvg qttools qttranslations qtwayland
-        qtwebsockets qtx11extras qtxmlpatterns
+        qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index dba3611683e3..e5d7d0d4372c 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -30,7 +30,12 @@ qtSubmodule {
       --replace /bin/echo ${coreutils}/bin/echo
     substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
-      
+
+    # hardcode paths for which default path resolution does not work in nix
+    sed -i -e 's,\(static QString potentialResourcesPath =\).*,\1 QLatin1String("'$out'/resources");,' src/core/web_engine_library_info.cpp
+    sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp
+    sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
new file mode 100644
index 000000000000..0820897b81db
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, requireFile
+, cudatoolkit
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  version = "5.1";
+  cudatoolkit_version = "8.0";
+
+  name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}";
+
+  src = fetchurl {
+    url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz";
+    sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8";
+  };
+
+  installPhase = ''
+    function fixRunPath {
+      p=$(patchelf --print-rpath $1)
+      patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1
+    }
+    fixRunPath lib64/libcudnn.so
+
+    mkdir -p $out
+    cp -a include $out/include
+    cp -a lib64 $out/lib64
+  '';
+
+  propagatedBuildInputs = [
+    cudatoolkit
+  ];
+
+  meta = with stdenv.lib; {
+    description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
+    homepage = "https://developer.nvidia.com/cudnn";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with maintainers; [ mdaiter ];
+  };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3893875a2347..e0e8c2686296 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -11,11 +11,12 @@ let blas64_ = blas64; in
 let local = config.openblas.preferLocalBuild or false;
     binary =
       { i686-linux = "32";
+        armv7l-linux = "32";
         x86_64-linux = "64";
         x86_64-darwin = "64";
       }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     genericFlags =
-      [ "DYNAMIC_ARCH=1"
+      [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}"
         "NUM_THREADS=64"
       ];
     localFlags = config.openblas.flags or
@@ -65,7 +66,9 @@ stdenv.mkDerivation {
       "BINARY=${binary}"
       "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
       "INTERFACE64=${if blas64 then "1" else "0"}"
-    ];
+    ]
+    ++
+    optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"];
 
   doCheck = true;
   checkTarget = "tests";
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index a55173a62b3c..c4db48248f33 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }:
+{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "slang-2.3.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s|-ltermcap|-lncurses|" ./configure
   '';
   configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
-  buildInputs = [ pcre libpng zlib readline ];
+  buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
   propagatedBuildInputs = [ ncurses ];
 
   postInstall = ''
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 0e4de5f6bb71..e6c31441967e 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -310,13 +310,13 @@ let
         sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
       };
     };
-    "which-1.2.11" = {
+    "which-1.2.12" = {
       name = "which";
       packageName = "which";
-      version = "1.2.11";
+      version = "1.2.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz";
-        sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b";
+        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
+        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
     "os-homedir-1.0.2" = {
@@ -868,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.15.2" = {
+    "moment-2.16.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.15.2";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
-        sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
+        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
       };
     };
     "ms-rest-1.15.2" = {
@@ -1102,13 +1102,13 @@ let
         sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
       };
     };
-    "jws-3.1.3" = {
+    "jws-3.1.4" = {
       name = "jws";
       packageName = "jws";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz";
-        sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c";
+        url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
+        sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
       };
     };
     "node-uuid-1.4.7" = {
@@ -1138,184 +1138,31 @@ let
         sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
       };
     };
-    "base64url-1.0.6" = {
+    "base64url-2.0.0" = {
       name = "base64url";
       packageName = "base64url";
-      version = "1.0.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz";
-        sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681";
+        url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
+        sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.3" = {
+    "jwa-1.1.4" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz";
-        sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d";
-      };
-    };
-    "concat-stream-1.4.10" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.4.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
-        sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
-      };
-    };
-    "meow-2.0.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
-        sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "readable-stream-1.1.14" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "camelcase-keys-1.0.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
-        sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
-      };
-    };
-    "indent-string-1.2.2" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
-        sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
-      };
-    };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
-      };
-    };
-    "object-assign-1.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
-        sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "map-obj-1.0.1" = {
-      name = "map-obj";
-      packageName = "map-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
-      };
-    };
-    "get-stdin-4.0.1" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-      };
-    };
-    "repeating-1.1.3" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
-        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
-      };
-    };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.0.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1462,6 +1309,24 @@ let
         sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
       };
     };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1480,6 +1345,15 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -1831,6 +1705,15 @@ let
         sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
       };
     };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
     "aws-sign2-0.6.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
@@ -1948,13 +1831,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.12" = {
+    "mime-types-2.1.13" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.12";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
-        sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -2020,13 +1903,13 @@ let
         sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "lodash-4.16.6" = {
+    "lodash-4.17.2" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.16.6";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz";
-        sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
       };
     };
     "chalk-1.1.3" = {
@@ -2353,13 +2236,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.24.0" = {
+    "mime-db-1.25.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.24.0";
+      version = "1.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
-        sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
       };
     };
     "punycode-1.4.1" = {
@@ -2443,6 +2326,15 @@ let
         sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
       };
     };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2524,13 +2416,13 @@ let
         sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
       };
     };
-    "bower-1.7.9" = {
+    "bower-1.8.0" = {
       name = "bower";
       packageName = "bower";
-      version = "1.7.9";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
-        sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+        sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
       };
     };
     "bower-endpoint-parser-0.2.1" = {
@@ -2776,13 +2668,13 @@ let
         sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
       };
     };
-    "statuses-1.3.0" = {
+    "statuses-1.3.1" = {
       name = "statuses";
       packageName = "statuses";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
-        sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
       };
     };
     "timed-out-2.0.0" = {
@@ -2803,13 +2695,13 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.1.5" = {
+    "readable-stream-2.2.2" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.1.5";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
       };
     };
     "stream-shift-1.0.0" = {
@@ -2866,6 +2758,24 @@ let
         sha1 = "5b46f80147edee578870f086d04821cf998e551f";
       };
     };
+    "map-obj-1.0.1" = {
+      name = "map-obj";
+      packageName = "map-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
     "normalize-package-data-2.3.5" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
@@ -3145,6 +3055,33 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "get-stdin-4.0.1" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+      };
+    };
     "sort-keys-1.1.2" = {
       name = "sort-keys";
       packageName = "sort-keys";
@@ -3199,22 +3136,22 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.2.0" = {
+    "debug-2.3.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.2.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
-    "ms-0.7.1" = {
+    "ms-0.7.2" = {
       name = "ms";
       packageName = "ms";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
     "rimraf-2.2.8" = {
@@ -3505,13 +3442,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.4.1" = {
+    "stream-http-2.5.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.4.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
-        sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
       };
     };
     "subarg-1.0.0" = {
@@ -3883,13 +3820,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.8.1" = {
+    "asn1.js-4.9.0" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.8.1";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz";
-        sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3901,13 +3838,13 @@ let
         sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
       };
     };
-    "sha.js-2.4.5" = {
+    "sha.js-2.4.8" = {
       name = "sha.js";
       packageName = "sha.js";
-      version = "2.4.5";
+      version = "2.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
-        sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
+        sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
       };
     };
     "miller-rabin-4.0.0" = {
@@ -4486,6 +4423,15 @@ let
         sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
       };
     };
+    "object-assign-1.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+        sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+      };
+    };
     "airplay-js-0.2.16" = {
       name = "airplay-js";
       packageName = "airplay-js";
@@ -4594,13 +4540,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.0" = {
+    "mdns-js-0.5.1" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz";
-        sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
       };
     };
     "plist-2.0.1" = {
@@ -4612,13 +4558,13 @@ let
         sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b";
       };
     };
-    "mdns-js-packet-0.2.0" = {
-      name = "mdns-js-packet";
-      packageName = "mdns-js-packet";
-      version = "0.2.0";
+    "dns-js-0.2.1" = {
+      name = "dns-js";
+      packageName = "dns-js";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz";
-        sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616";
+        url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz";
+        sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673";
       };
     };
     "semver-5.1.1" = {
@@ -4738,13 +4684,13 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
-    "magnet-uri-5.1.4" = {
+    "magnet-uri-5.1.5" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz";
-        sha1 = "225db1f8670a944db87a5fbe27e2d90350513403";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
+        sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
       };
     };
     "parse-torrent-file-4.0.0" = {
@@ -5089,6 +5035,15 @@ let
         sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
       };
     };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
     "bncode-0.2.3" = {
       name = "bncode";
       packageName = "bncode";
@@ -5728,13 +5683,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.16" = {
+    "big-integer-1.6.17" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.16";
+      version = "1.6.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
-        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
+        sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
       };
     };
     "sax-0.3.5" = {
@@ -6070,6 +6025,15 @@ let
         sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
       };
     };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      };
+    };
     "on-headers-1.0.1" = {
       name = "on-headers";
       packageName = "on-headers";
@@ -6097,6 +6061,15 @@ let
         sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
       };
     };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "array-flatten-1.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
@@ -6277,13 +6250,13 @@ let
         sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
       };
     };
-    "type-is-1.6.13" = {
+    "type-is-1.6.14" = {
       name = "type-is";
       packageName = "type-is";
-      version = "1.6.13";
+      version = "1.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
-        sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
+        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
       };
     };
     "utils-merge-1.0.0" = {
@@ -6340,22 +6313,22 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.5.0" = {
+    "http-errors-1.5.1" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
-        sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
       };
     };
-    "setprototypeof-1.0.1" = {
+    "setprototypeof-1.0.2" = {
       name = "setprototypeof";
       packageName = "setprototypeof";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
-        sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
       };
     };
     "media-typer-0.3.0" = {
@@ -6736,6 +6709,15 @@ let
         sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
       };
     };
+    "readable-stream-2.1.5" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
+        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+      };
+    };
     "realize-package-specifier-3.0.3" = {
       name = "realize-package-specifier";
       packageName = "realize-package-specifier";
@@ -7294,13 +7276,13 @@ let
         sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
       };
     };
-    "request-2.78.0" = {
+    "request-2.79.0" = {
       name = "request";
       packageName = "request";
-      version = "2.78.0";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
     "uuid-2.0.3" = {
@@ -7456,13 +7438,22 @@ let
         sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
       };
     };
-    "form-data-2.1.1" = {
+    "form-data-2.1.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.1.1";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
+      };
+    };
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
-        sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
     "asynckit-0.4.0" = {
@@ -7492,6 +7483,15 @@ let
         sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
       };
     };
+    "repeating-1.1.3" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+      };
+    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -8135,13 +8135,13 @@ let
         sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
       };
     };
-    "verror-1.8.1" = {
+    "verror-1.9.0" = {
       name = "verror";
       packageName = "verror";
-      version = "1.8.1";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz";
-        sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029";
+        url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
+        sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
       };
     };
     "extsprintf-1.3.0" = {
@@ -8234,13 +8234,13 @@ let
         sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
       };
     };
-    "basic-auth-1.0.4" = {
+    "basic-auth-1.1.0" = {
       name = "basic-auth";
       packageName = "basic-auth";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
-        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
+        sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
     "cors-2.8.1" = {
@@ -8486,13 +8486,13 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
-    "ltgt-2.1.2" = {
+    "ltgt-2.1.3" = {
       name = "ltgt";
       packageName = "ltgt";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
-        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz";
+        sha1 = "10851a06d9964b971178441c23c9e52698eece34";
       };
     };
     "pull-level-2.0.3" = {
@@ -8738,13 +8738,13 @@ let
         sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
       };
     };
-    "got-6.6.1" = {
+    "got-6.6.3" = {
       name = "got";
       packageName = "got";
-      version = "6.6.1";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.6.1.tgz";
-        sha1 = "542d7a0e34676060e561b1b90d103876eefabed2";
+        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8909,13 +8909,13 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.12.0" = {
+    "globals-9.14.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.12.0";
+      version = "9.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
-        sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
+        url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
+        sha1 = "8859936af0038741263053b39d0e76ca241e4034";
       };
     };
     "ignore-3.2.0" = {
@@ -8945,13 +8945,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.6.1" = {
+    "js-yaml-3.7.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.6.1";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -8999,13 +8999,13 @@ let
         sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
       };
     };
-    "require-uncached-1.0.2" = {
+    "require-uncached-1.0.3" = {
       name = "require-uncached";
       packageName = "require-uncached";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz";
-        sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
+        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
+        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
       };
     };
     "strip-bom-3.0.0" = {
@@ -9323,13 +9323,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.8.2" = {
+    "ajv-4.9.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.8.2";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
-        sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
       };
     };
     "ajv-keywords-1.1.1" = {
@@ -9890,13 +9890,13 @@ let
         sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
-    "npmlog-4.0.0" = {
+    "npmlog-4.0.1" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz";
-        sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9917,13 +9917,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.6.0" = {
+    "gauge-2.7.1" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.6.0";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
-        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10125,13 +10125,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.20" = {
+    "clean-css-3.4.21" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.20";
+      version = "3.4.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
-        sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
       };
     };
     "commander-2.6.0" = {
@@ -10305,6 +10305,15 @@ let
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
     "cliui-2.1.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -10422,22 +10431,22 @@ let
         sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385";
       };
     };
-    "orchestrator-0.3.7" = {
+    "orchestrator-0.3.8" = {
       name = "orchestrator";
       packageName = "orchestrator";
-      version = "0.3.7";
+      version = "0.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
-        sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+        url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz";
+        sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e";
       };
     };
-    "pretty-hrtime-1.0.2" = {
+    "pretty-hrtime-1.0.3" = {
       name = "pretty-hrtime";
       packageName = "pretty-hrtime";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz";
-        sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8";
+        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+        sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
       };
     };
     "tildify-1.2.0" = {
@@ -10476,13 +10485,13 @@ let
         sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
       };
     };
-    "beeper-1.1.0" = {
+    "beeper-1.1.1" = {
       name = "beeper";
       packageName = "beeper";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz";
-        sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c";
+        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
+        sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
     "dateformat-1.0.12" = {
@@ -11295,13 +11304,13 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
-    "handlebars-4.0.5" = {
+    "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.0.5";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz";
-        sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz";
+        sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
       };
     };
     "supports-color-3.1.2" = {
@@ -11961,6 +11970,15 @@ let
         sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
       };
     };
+    "basic-auth-1.0.4" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+      };
+    };
     "connect-2.30.2" = {
       name = "connect";
       packageName = "connect";
@@ -12105,13 +12123,13 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.6" = {
+    "method-override-2.3.7" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
-        sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
       };
     };
     "morgan-1.6.1" = {
@@ -12150,22 +12168,22 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "response-time-2.3.1" = {
+    "response-time-2.3.2" = {
       name = "response-time";
       packageName = "response-time";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
-        sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
+        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
       };
     };
-    "serve-favicon-2.3.0" = {
+    "serve-favicon-2.3.2" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.3.0";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
-        sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
       };
     };
     "serve-index-1.7.3" = {
@@ -12204,22 +12222,13 @@ let
         sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
-    "csrf-3.0.3" = {
+    "csrf-3.0.4" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
-        sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
-      };
-    };
-    "base64-url-1.2.2" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.2.2";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
-        sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
+        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
     "rndm-1.2.0" = {
@@ -12240,13 +12249,13 @@ let
         sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "uid-safe-2.1.1" = {
+    "uid-safe-2.1.3" = {
       name = "uid-safe";
       packageName = "uid-safe";
-      version = "2.1.1";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
-        sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
+        sha1 = "077e264a00b3187936b270bb7376a26473631071";
       };
     };
     "random-bytes-1.0.0" = {
@@ -12789,6 +12798,15 @@ let
         sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
       };
     };
+    "gauge-2.6.0" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+      };
+    };
     "uid-number-0.0.5" = {
       name = "uid-number";
       packageName = "uid-number";
@@ -13311,49 +13329,49 @@ let
         sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
       };
     };
-    "node-red-node-feedparser-0.1.6" = {
+    "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
-        sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
+        sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.11" = {
+    "node-red-node-email-0.1.12" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.11";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz";
-        sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
       };
     };
-    "node-red-node-twitter-0.1.7" = {
+    "node-red-node-twitter-0.1.9" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.7";
+      version = "0.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz";
-        sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
+        sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
       };
     };
-    "node-red-node-rbe-0.1.5" = {
+    "node-red-node-rbe-0.1.6" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.5";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz";
-        sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
+        sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.0" = {
+    "node-red-node-serialport-0.4.1" = {
       name = "node-red-node-serialport";
       packageName = "node-red-node-serialport";
-      version = "0.4.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
-        sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
       };
     };
     "bcrypt-0.8.7" = {
@@ -13509,13 +13527,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.7" = {
+    "moment-timezone-0.5.9" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.7";
+      version = "0.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
-        sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
       };
     };
     "retry-0.6.1" = {
@@ -13527,13 +13545,13 @@ let
         sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "cookies-0.6.1" = {
+    "cookies-0.6.2" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz";
-        sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
+        sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
       };
     };
     "i18next-client-1.10.3" = {
@@ -13617,13 +13635,13 @@ let
         sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
       };
     };
-    "websocket-stream-3.3.0" = {
+    "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "3.3.0";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz";
-        sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
+        sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
       };
     };
     "leven-1.0.2" = {
@@ -13896,13 +13914,13 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "uue-3.0.0" = {
+    "uue-3.1.0" = {
       name = "uue";
       packageName = "uue";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz";
-        sha1 = "07af69344defa9851b7b845c1c18110b8264e51e";
+        url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
+        sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
       };
     };
     "utf7-1.0.2" = {
@@ -13923,13 +13941,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.4" = {
+    "serialport-4.0.6" = {
       name = "serialport";
       packageName = "serialport";
-      version = "4.0.4";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.4.tgz";
-        sha1 = "93e55ad75e0451fcdeabb939c08da01da138a74a";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
       };
     };
     "lie-3.1.0" = {
@@ -14202,13 +14220,13 @@ let
         sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
       };
     };
-    "buffer-crc32-0.2.5" = {
+    "buffer-crc32-0.2.6" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
-      version = "0.2.5";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
-        sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
+        sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
       };
     };
     "fresh-0.1.0" = {
@@ -14517,13 +14535,13 @@ let
         sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
       };
     };
-    "raw-socket-1.5.0" = {
+    "raw-socket-1.5.1" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz";
-        sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
+        sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
     "argparse-0.1.16" = {
@@ -14607,6 +14625,15 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14616,6 +14643,15 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
+    "npm-registry-client-7.3.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "7.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+      };
+    };
     "opener-1.4.2" = {
       name = "opener";
       packageName = "opener";
@@ -14643,13 +14679,22 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.75.0" = {
+    "request-2.78.0" = {
       name = "request";
       packageName = "request";
-      version = "2.75.0";
+      version = "2.78.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
+    "sorted-union-stream-2.1.3" = {
+      name = "sorted-union-stream";
+      packageName = "sorted-union-stream";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
+        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
     "unique-filename-1.1.0" = {
@@ -14697,13 +14742,40 @@ let
         sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
-    "form-data-2.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.0.0";
+    "flush-write-stream-1.0.2" = {
+      name = "flush-write-stream";
+      packageName = "flush-write-stream";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
+        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
+      };
+    };
+    "from2-2.3.0" = {
+      name = "from2";
+      packageName = "from2";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    };
+    "stream-each-1.2.0" = {
+      name = "stream-each";
+      packageName = "stream-each";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
+        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+      };
+    };
+    "stream-iterate-1.2.0" = {
+      name = "stream-iterate";
+      packageName = "stream-iterate";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
       };
     };
     "unique-slug-2.0.0" = {
@@ -14931,13 +15003,13 @@ let
         sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "npm-3.10.9" = {
+    "npm-3.10.10" = {
       name = "npm";
       packageName = "npm";
-      version = "3.10.9";
+      version = "3.10.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
-        sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+        url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+        sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
     "npmi-2.0.1" = {
@@ -14985,6 +15057,24 @@ let
         sha1 = "27c90519196dc15015be02a34ea52986feab8877";
       };
     };
+    "request-2.75.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.75.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+      };
+    };
+    "form-data-2.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+      };
+    };
     "boxen-0.6.0" = {
       name = "boxen";
       packageName = "boxen";
@@ -15129,15 +15219,6 @@ let
         sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
       };
     };
-    "bunyan-1.8.4" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
-        sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
-      };
-    };
     "connect-busboy-0.0.2" = {
       name = "connect-busboy";
       packageName = "connect-busboy";
@@ -15147,13 +15228,14 @@ let
         sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
       };
     };
-    "core-js-1.2.7" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz";
-        sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+    "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.1";
+      src = fetchgit {
+        url = "https://github.com/wikimedia/content-type.git";
+        rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
     "diff-1.4.0" = {
@@ -15174,22 +15256,22 @@ let
         sha1 = "26bc01f739707505c51456af7f59e3373369475d";
       };
     };
-    "express-handlebars-2.0.1" = {
+    "express-handlebars-3.0.0" = {
       name = "express-handlebars";
       packageName = "express-handlebars";
-      version = "2.0.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz";
-        sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1";
+        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz";
+        sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
-    "finalhandler-0.4.1" = {
+    "finalhandler-0.5.1" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.4.1";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
     "gelf-stream-0.2.4" = {
@@ -15201,22 +15283,23 @@ let
         sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
       };
     };
-    "html5-1.0.5" = {
-      name = "html5";
-      packageName = "html5";
-      version = "1.0.5";
+    "mediawiki-title-0.5.6" = {
+      name = "mediawiki-title";
+      packageName = "mediawiki-title";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
-        sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848";
+        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz";
+        sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24";
       };
     };
-    "node-txstatsd-0.1.6" = {
-      name = "node-txstatsd";
-      packageName = "node-txstatsd";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz";
-        sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04";
+    "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.6.1";
+      src = fetchgit {
+        url = "https://github.com/arlolra/negotiator.git";
+        rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
     "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
@@ -15225,8 +15308,8 @@ let
       version = "0.8.0";
       src = fetchgit {
         url = "https://github.com/tstarling/pegjs.git";
-        rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a";
-        sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa";
+        rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584";
+        sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905";
       };
     };
     "prfun-2.1.4" = {
@@ -15238,6 +15321,15 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
+    "service-runner-2.1.11" = {
+      name = "service-runner";
+      packageName = "service-runner";
+      version = "2.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+      };
+    };
     "simplediff-0.1.1" = {
       name = "simplediff";
       packageName = "simplediff";
@@ -15247,6 +15339,15 @@ let
         sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
       };
     };
+    "yargs-4.8.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "4.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+      };
+    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -15256,13 +15357,103 @@ let
         sha1 = "07e30ad79531844179b642d2d8399435182c8727";
       };
     };
-    "dtrace-provider-0.7.1" = {
+    "busboy-0.2.13" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+      };
+    };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
+    "gelfling-0.2.0" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+      };
+    };
+    "bunyan-1.8.5" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
+        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+      };
+    };
+    "bunyan-syslog-udp-0.1.0" = {
+      name = "bunyan-syslog-udp";
+      packageName = "bunyan-syslog-udp";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz";
+        sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c";
+      };
+    };
+    "gelf-stream-1.1.1" = {
+      name = "gelf-stream";
+      packageName = "gelf-stream";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+        sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+      };
+    };
+    "hot-shots-4.3.1" = {
+      name = "hot-shots";
+      packageName = "hot-shots";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
+        sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+      };
+    };
+    "limitation-0.1.9" = {
+      name = "limitation";
+      packageName = "limitation";
+      version = "0.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
+        sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+      };
+    };
+    "yargs-5.0.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+      };
+    };
+    "dtrace-provider-0.8.0" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.7.1";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
-        sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
+        sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
       };
     };
     "mv-2.1.1" = {
@@ -15301,139 +15492,167 @@ let
         sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
       };
     };
-    "busboy-0.2.13" = {
-      name = "busboy";
-      packageName = "busboy";
-      version = "0.2.13";
+    "gelfling-0.3.1" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
-        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+        sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
       };
     };
-    "dicer-0.2.5" = {
-      name = "dicer";
-      packageName = "dicer";
-      version = "0.2.5";
+    "kad-git+https://github.com/gwicke/kad.git#master" = {
+      name = "kad";
+      packageName = "kad";
+      version = "1.3.6";
+      src = fetchgit {
+        url = "https://github.com/gwicke/kad.git";
+        rev = "f35971036f43814043245da82b12d035b7bbfd16";
+        sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
+      };
+    };
+    "clarinet-0.11.0" = {
+      name = "clarinet";
+      packageName = "clarinet";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
-        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+        url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+        sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
       };
     };
-    "streamsearch-0.1.2" = {
-      name = "streamsearch";
-      packageName = "streamsearch";
-      version = "0.1.2";
+    "kad-fs-0.0.4" = {
+      name = "kad-fs";
+      packageName = "kad-fs";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
-        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+        url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+        sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
       };
     };
-    "handlebars-3.0.3" = {
-      name = "handlebars";
-      packageName = "handlebars";
-      version = "3.0.3";
+    "kad-localstorage-0.0.7" = {
+      name = "kad-localstorage";
+      packageName = "kad-localstorage";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz";
-        sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad";
+        url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+        sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
       };
     };
-    "object.assign-1.1.1" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "1.1.1";
+    "kad-memstore-0.0.1" = {
+      name = "kad-memstore";
+      packageName = "kad-memstore";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz";
-        sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c";
+        url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+        sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
       };
     };
-    "uglify-js-2.3.6" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.3.6";
+    "merge-1.2.0" = {
+      name = "merge";
+      packageName = "merge";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
-        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+        url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz";
+        sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
       };
     };
-    "gelfling-0.2.0" = {
-      name = "gelfling";
-      packageName = "gelfling";
-      version = "0.2.0";
+    "msgpack5-3.4.1" = {
+      name = "msgpack5";
+      packageName = "msgpack5";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
-        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz";
+        sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114";
       };
     };
-    "opts-1.2.2" = {
-      name = "opts";
-      packageName = "opts";
-      version = "1.2.2";
+    "dom-storage-2.0.2" = {
+      name = "dom-storage";
+      packageName = "dom-storage";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
-        sha1 = "81782b93014a1cd88d56c226643fd4282473853d";
+        url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz";
+        sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
-    "html5-entities-1.0.0" = {
-      name = "html5-entities";
-      packageName = "html5-entities";
-      version = "1.0.0";
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
-        sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370";
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "jsdom-0.11.1" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "0.11.1";
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
-        sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb";
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
       };
     };
-    "nwmatcher-1.3.9" = {
-      name = "nwmatcher";
-      packageName = "nwmatcher";
-      version = "1.3.9";
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
-        sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "xmlhttprequest-1.8.0" = {
-      name = "xmlhttprequest";
-      packageName = "xmlhttprequest";
-      version = "1.8.0";
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
-        sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "cssom-0.3.1" = {
-      name = "cssom";
-      packageName = "cssom";
-      version = "0.3.1";
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz";
-        sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3";
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
-    "cssstyle-0.2.37" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "0.2.37";
+    "window-size-0.2.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
-        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
       };
     };
-    "contextify-0.1.15" = {
-      name = "contextify";
-      packageName = "contextify";
-      version = "0.1.15";
+    "yargs-parser-3.2.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "yargs-parser-2.4.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz";
-        sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
     "airplayer-2.0.0" = {
@@ -15454,13 +15673,13 @@ let
         sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
       };
     };
-    "inquirer-1.2.2" = {
+    "inquirer-1.2.3" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
-        sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
+        sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
       };
     };
     "network-address-1.1.0" = {
@@ -15634,13 +15853,13 @@ let
         sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
       };
     };
-    "dns-packet-1.1.0" = {
+    "dns-packet-1.1.1" = {
       name = "dns-packet";
       packageName = "dns-packet";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz";
-        sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
+        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz";
+        sha1 = "2369d45038af045f3898e6fa56862aed3f40296c";
       };
     };
     "external-editor-1.1.1" = {
@@ -15715,13 +15934,13 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-0.9.17" = {
+    "socket.io-1.6.0" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "0.9.17";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
-        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
       };
     };
     "torrent-stream-0.18.1" = {
@@ -16093,13 +16312,121 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "socket.io-client-0.9.16" = {
+    "engine.io-1.8.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.6.0" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "0.9.16";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
-        sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "engine.io-parser-1.3.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+      };
+    };
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    };
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "engine.io-client-1.8.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
       };
     };
     "bittorrent-dht-3.2.6" = {
@@ -16859,6 +17186,15 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
+    "uglify-js-2.3.6" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      };
+    };
     "markdown-it-4.4.0" = {
       name = "markdown-it";
       packageName = "markdown-it";
@@ -17264,6 +17600,15 @@ let
         sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
       };
     };
+    "js-yaml-3.6.1" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+      };
+    };
     "whet.extend-0.9.9" = {
       name = "whet.extend";
       packageName = "whet.extend";
@@ -17309,31 +17654,22 @@ let
         sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
       };
     };
-    "longjohn-0.2.9" = {
+    "longjohn-0.2.11" = {
       name = "longjohn";
       packageName = "longjohn";
-      version = "0.2.9";
+      version = "0.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
-        sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
+        sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
       };
     };
-    "node-appc-0.2.31" = {
+    "node-appc-0.2.39" = {
       name = "node-appc";
       packageName = "node-appc";
-      version = "0.2.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
-        sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
-      };
-    };
-    "request-2.62.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.62.0";
+      version = "0.2.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz";
-        sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
+        sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
     "sprintf-0.1.5" = {
@@ -17345,22 +17681,22 @@ let
         sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
       };
     };
-    "winston-1.0.2" = {
+    "winston-1.1.2" = {
       name = "winston";
       packageName = "winston";
-      version = "1.0.2";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
-        sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
+        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+        sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
-    "wrench-1.5.8" = {
+    "wrench-1.5.9" = {
       name = "wrench";
       packageName = "wrench";
-      version = "1.5.8";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
-        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
       };
     };
     "source-map-support-0.3.2" = {
@@ -17390,85 +17726,58 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "diff-2.1.0" = {
+    "diff-2.2.1" = {
       name = "diff";
       packageName = "diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
-        sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
-      };
-    };
-    "node-uuid-1.4.3" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.3";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-        sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
+        sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
       };
     };
-    "request-2.61.0" = {
+    "request-2.69.0" = {
       name = "request";
       packageName = "request";
-      version = "2.61.0";
+      version = "2.69.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz";
-        sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
+        url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
+        sha1 = "cf91d2e000752b1217155c005241911991a2346a";
       };
     };
-    "semver-5.0.1" = {
+    "semver-5.1.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
-        sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
-      };
-    };
-    "uglify-js-2.4.24" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.4.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
-        sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
-      };
-    };
-    "har-validator-1.8.0" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "1.8.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
-        sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+        sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
       };
     };
-    "bluebird-2.11.0" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "2.11.0";
+    "wrench-1.5.8" = {
+      name = "wrench";
+      packageName = "wrench";
+      version = "1.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
-        sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
       };
     };
-    "yargs-3.5.4" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.5.4";
+    "uglify-js-2.6.1" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
-        sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "qs-5.1.0" = {
+    "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
-      version = "5.1.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
-        sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
+        url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+        sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
     "bluebird-3.3.5" = {
@@ -17570,13 +17879,13 @@ let
         sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
       };
     };
-    "knockout-3.4.0" = {
+    "knockout-3.4.1" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz";
-        sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
+        sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
     "lodash-4.12.0" = {
@@ -17678,13 +17987,13 @@ let
         sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
       };
     };
-    "color-convert-1.6.0" = {
+    "color-convert-1.8.2" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.6.0";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.6.0.tgz";
-        sha1 = "7592755faf53938a05b1ea8e5374cab77d6dd190";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
+        sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
     "color-string-0.3.0" = {
@@ -17723,6 +18032,15 @@ let
         sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
       };
     };
+    "finalhandler-0.4.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+      };
+    };
     "send-0.13.1" = {
       name = "send";
       packageName = "send";
@@ -17849,22 +18167,22 @@ let
         sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
       };
     };
-    "editions-1.3.1" = {
+    "editions-1.3.3" = {
       name = "editions";
       packageName = "editions";
-      version = "1.3.1";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
-        sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
+        sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
       };
     };
-    "typechecker-4.3.0" = {
+    "typechecker-4.4.0" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz";
-        sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
+        sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
       };
     };
     "underscore-1.5.2" = {
@@ -18038,24 +18356,6 @@ let
         sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "pkg-conf-1.1.3" = {
       name = "pkg-conf";
       packageName = "pkg-conf";
@@ -18065,15 +18365,6 @@ let
         sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
     "set-blocking-1.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -18083,24 +18374,6 @@ let
         sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
       };
     };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "symbol-0.2.3" = {
       name = "symbol";
       packageName = "symbol";
@@ -18437,7 +18710,7 @@ in
                       sources."os-tmpdir-1.0.2"
                     ];
                   })
-                  (sources."which-1.2.11" // {
+                  (sources."which-1.2.12" // {
                     dependencies = [
                       sources."isexe-1.1.2"
                     ];
@@ -18491,52 +18764,10 @@ in
       (sources."adal-node-0.1.21" // {
         dependencies = [
           sources."date-utils-1.2.21"
-          (sources."jws-3.1.3" // {
+          (sources."jws-3.1.4" // {
             dependencies = [
-              (sources."base64url-1.0.6" // {
-                dependencies = [
-                  (sources."concat-stream-1.4.10" // {
-                    dependencies = [
-                      sources."inherits-2.0.3"
-                      sources."typedarray-0.0.6"
-                      (sources."readable-stream-1.1.14" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."isarray-0.0.1"
-                          sources."string_decoder-0.10.31"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."meow-2.0.0" // {
-                    dependencies = [
-                      (sources."camelcase-keys-1.0.0" // {
-                        dependencies = [
-                          sources."camelcase-1.2.1"
-                          sources."map-obj-1.0.1"
-                        ];
-                      })
-                      (sources."indent-string-1.2.2" // {
-                        dependencies = [
-                          sources."get-stdin-4.0.1"
-                          (sources."repeating-1.1.3" // {
-                            dependencies = [
-                              (sources."is-finite-1.0.2" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                      sources."minimist-1.2.0"
-                      sources."object-assign-1.0.0"
-                    ];
-                  })
-                ];
-              })
-              (sources."jwa-1.1.3" // {
+              sources."base64url-2.0.0"
+              (sources."jwa-1.1.4" // {
                 dependencies = [
                   sources."buffer-equal-constant-time-1.0.1"
                   (sources."ecdsa-sig-formatter-1.0.7" // {
@@ -18546,6 +18777,7 @@ in
                   })
                 ];
               })
+              sources."safe-buffer-5.0.1"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -18696,7 +18928,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.15.2"
+      sources."moment-2.16.0"
       (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
@@ -18817,7 +19049,7 @@ in
             dependencies = [
               (sources."async-2.1.2" // {
                 dependencies = [
-                  sources."lodash-4.16.6"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
@@ -18901,9 +19133,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -19011,10 +19243,10 @@ in
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
-    version = "1.7.9";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
-      sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+      sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19038,7 +19270,7 @@ in
           sources."sprintf-js-1.0.3"
         ];
       })
-      sources."bower-1.7.9"
+      sources."bower-1.8.0"
       sources."bower-endpoint-parser-0.2.1"
       (sources."bower-json-0.6.0" // {
         dependencies = [
@@ -19062,7 +19294,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -19087,12 +19319,12 @@ in
                       sources."prepend-http-1.0.4"
                       (sources."read-all-stream-2.2.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
                               sources."isarray-1.0.0"
+                              sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
                               sources."string_decoder-0.10.31"
                               sources."util-deprecate-1.0.2"
@@ -19100,7 +19332,7 @@ in
                           })
                         ];
                       })
-                      sources."statuses-1.3.0"
+                      sources."statuses-1.3.1"
                       sources."timed-out-2.0.0"
                     ];
                   })
@@ -19288,9 +19520,9 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           (sources."mkdirp-0.5.1" // {
@@ -19439,7 +19671,7 @@ in
               })
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.8.1" // {
+                  (sources."asn1.js-4.9.0" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19470,7 +19702,7 @@ in
             dependencies = [
               sources."cipher-base-1.0.3"
               sources."ripemd160-1.0.1"
-              sources."sha.js-2.4.5"
+              sources."sha.js-2.4.8"
             ];
           })
           sources."create-hmac-1.1.4"
@@ -19491,7 +19723,7 @@ in
               sources."browserify-rsa-4.0.1"
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.8.1" // {
+                  (sources."asn1.js-4.9.0" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19597,7 +19829,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.1.5" // {
+      (sources."readable-stream-2.2.2" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -19614,7 +19846,7 @@ in
               sources."jsonify-0.0.0"
             ];
           })
-          sources."sha.js-2.4.5"
+          sources."sha.js-2.4.8"
         ];
       })
       (sources."shell-quote-1.6.1" // {
@@ -19626,7 +19858,7 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.4.1" // {
+      (sources."stream-http-2.5.0" // {
         dependencies = [
           sources."builtin-status-codes-2.0.0"
           sources."to-arraybuffer-1.0.1"
@@ -19762,9 +19994,9 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       sources."fs-extended-0.2.1"
@@ -19904,9 +20136,9 @@ in
         dependencies = [
           (sources."airplay-js-0.2.16" // {
             dependencies = [
-              (sources."mdns-js-0.5.0" // {
+              (sources."mdns-js-0.5.1" // {
                 dependencies = [
-                  (sources."mdns-js-packet-0.2.0" // {
+                  (sources."dns-js-0.2.1" // {
                     dependencies = [
                       sources."qap-3.1.3"
                     ];
@@ -19958,7 +20190,7 @@ in
             dependencies = [
               sources."blob-to-buffer-1.2.6"
               sources."get-stdin-5.0.1"
-              (sources."magnet-uri-5.1.4" // {
+              (sources."magnet-uri-5.1.5" // {
                 dependencies = [
                   sources."thirty-two-1.0.2"
                   sources."uniq-1.0.1"
@@ -20184,7 +20416,7 @@ in
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -20198,7 +20430,7 @@ in
                       })
                       (sources."simple-websocket-4.1.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -20359,7 +20591,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.6"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -20404,7 +20636,7 @@ in
           sources."ansi-0.3.1"
           (sources."bplist-parser-0.1.1" // {
             dependencies = [
-              sources."big-integer-1.6.16"
+              sources."big-integer-1.6.17"
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
@@ -20623,7 +20855,7 @@ in
                           })
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.8.1" // {
+                              (sources."asn1.js-4.9.0" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -20654,7 +20886,7 @@ in
                         dependencies = [
                           sources."cipher-base-1.0.3"
                           sources."ripemd160-1.0.1"
-                          sources."sha.js-2.4.5"
+                          sources."sha.js-2.4.8"
                         ];
                       })
                       sources."create-hmac-1.1.4"
@@ -20675,7 +20907,7 @@ in
                           sources."browserify-rsa-4.0.1"
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.8.1" // {
+                              (sources."asn1.js-4.9.0" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -20757,7 +20989,7 @@ in
                   sources."punycode-1.4.1"
                   sources."querystring-es3-0.2.1"
                   sources."read-only-stream-2.0.0"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -20774,7 +21006,7 @@ in
                           sources."jsonify-0.0.0"
                         ];
                       })
-                      sources."sha.js-2.4.5"
+                      sources."sha.js-2.4.8"
                     ];
                   })
                   (sources."shell-quote-1.6.1" // {
@@ -20786,7 +21018,7 @@ in
                     ];
                   })
                   sources."stream-browserify-2.0.1"
-                  (sources."stream-http-2.4.1" // {
+                  (sources."stream-http-2.5.0" // {
                     dependencies = [
                       sources."builtin-status-codes-2.0.0"
                       sources."to-arraybuffer-1.0.1"
@@ -20862,9 +21094,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -20873,7 +21105,7 @@ in
                   sources."bytes-2.3.0"
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   (sources."debug-2.2.0" // {
@@ -20889,9 +21121,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -20913,7 +21145,7 @@ in
                   sources."etag-1.7.0"
                   (sources."finalhandler-0.5.0" // {
                     dependencies = [
-                      sources."statuses-1.3.0"
+                      sources."statuses-1.3.1"
                       sources."unpipe-1.0.0"
                     ];
                   })
@@ -20938,24 +21170,24 @@ in
                   (sources."send-0.14.1" // {
                     dependencies = [
                       sources."destroy-1.0.4"
-                      (sources."http-errors-1.5.0" // {
+                      (sources."http-errors-1.5.1" // {
                         dependencies = [
-                          sources."inherits-2.0.1"
-                          sources."setprototypeof-1.0.1"
+                          sources."inherits-2.0.3"
+                          sources."setprototypeof-1.0.2"
                         ];
                       })
                       sources."mime-1.3.4"
                       sources."ms-0.7.1"
-                      sources."statuses-1.3.0"
+                      sources."statuses-1.3.1"
                     ];
                   })
                   sources."serve-static-1.11.1"
-                  (sources."type-is-1.6.13" // {
+                  (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                     ];
@@ -21175,9 +21407,9 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.2.0" // {
+                          (sources."debug-2.3.3" // {
                             dependencies = [
-                              sources."ms-0.7.1"
+                              sources."ms-0.7.2"
                             ];
                           })
                           (sources."es6-symbol-3.1.0" // {
@@ -21319,7 +21551,7 @@ in
                     dependencies = [
                       (sources."async-2.1.2" // {
                         dependencies = [
-                          sources."lodash-4.16.6"
+                          sources."lodash-4.17.2"
                         ];
                       })
                     ];
@@ -21394,9 +21626,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."node-uuid-1.4.7"
@@ -21434,7 +21666,7 @@ in
                   sources."builtins-0.0.7"
                 ];
               })
-              (sources."which-1.2.11" // {
+              (sources."which-1.2.12" // {
                 dependencies = [
                   sources."isexe-1.1.2"
                 ];
@@ -21699,7 +21931,7 @@ in
               })
             ];
           })
-          (sources."request-2.78.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
@@ -21711,7 +21943,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -21778,15 +22010,16 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
           (sources."tough-cookie-2.3.2" // {
@@ -21870,7 +22103,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -21901,12 +22134,12 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
                               sources."isarray-1.0.0"
+                              sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
                               sources."string_decoder-0.10.31"
                               sources."util-deprecate-1.0.2"
@@ -22012,9 +22245,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -22119,7 +22352,7 @@ in
                 dependencies = [
                   (sources."buffercursor-0.0.12" // {
                     dependencies = [
-                      (sources."verror-1.8.1" // {
+                      (sources."verror-1.9.0" // {
                         dependencies = [
                           sources."assert-plus-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -22136,7 +22369,7 @@ in
             dependencies = [
               (sources."buffercursor-0.0.12" // {
                 dependencies = [
-                  (sources."verror-1.8.1" // {
+                  (sources."verror-1.9.0" // {
                     dependencies = [
                       sources."assert-plus-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -22153,7 +22386,7 @@ in
         dependencies = [
           (sources."buffercursor-0.0.12" // {
             dependencies = [
-              (sources."verror-1.8.1" // {
+              (sources."verror-1.9.0" // {
                 dependencies = [
                   sources."assert-plus-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22198,9 +22431,9 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."reduce-component-1.0.1"
@@ -22249,7 +22482,7 @@ in
           sources."through-2.3.8"
         ];
       })
-      sources."basic-auth-1.0.4"
+      sources."basic-auth-1.1.0"
       sources."cookie-signature-1.0.6"
       (sources."cors-2.8.1" // {
         dependencies = [
@@ -22292,7 +22525,7 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22351,7 +22584,7 @@ in
               sources."xtend-3.0.0"
             ];
           })
-          sources."ltgt-2.1.2"
+          sources."ltgt-2.1.3"
           (sources."pull-level-2.0.3" // {
             dependencies = [
               sources."level-post-1.0.5"
@@ -22447,7 +22680,7 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22509,12 +22742,12 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -22562,7 +22795,7 @@ in
       })
       (sources."async-2.0.1" // {
         dependencies = [
-          sources."lodash-4.16.6"
+          sources."lodash-4.17.2"
         ];
       })
       sources."aws4-1.5.0"
@@ -22572,7 +22805,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."caseless-0.11.0"
@@ -22583,7 +22816,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.1" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -22667,12 +22900,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -22682,6 +22914,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
         ];
       })
     ];
@@ -22714,7 +22947,7 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."got-6.6.1" // {
+      (sources."got-6.6.3" // {
         dependencies = [
           (sources."create-error-class-3.0.2" // {
             dependencies = [
@@ -22901,10 +23134,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.9.1";
+    version = "3.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.9.1.tgz";
-      sha1 = "5a8597706fc6048bc6061ac754d4a211d28f4f5b";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
     };
     dependencies = [
       (sources."babel-code-frame-6.16.0" // {
@@ -22944,9 +23177,9 @@ in
           })
         ];
       })
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       (sources."doctrine-1.5.0" // {
@@ -23060,7 +23293,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."globals-9.12.0"
+      sources."globals-9.14.0"
       sources."ignore-3.2.0"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
@@ -23136,7 +23369,7 @@ in
           sources."tryit-1.0.3"
         ];
       })
-      (sources."js-yaml-3.6.1" // {
+      (sources."js-yaml-3.7.0" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -23157,7 +23390,7 @@ in
           sources."type-check-0.3.2"
         ];
       })
-      sources."lodash-4.16.6"
+      sources."lodash-4.17.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23176,7 +23409,7 @@ in
       sources."path-is-inside-1.0.2"
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
-      (sources."require-uncached-1.0.2" // {
+      (sources."require-uncached-1.0.3" // {
         dependencies = [
           (sources."caller-path-0.1.0" // {
             dependencies = [
@@ -23200,7 +23433,7 @@ in
       sources."strip-json-comments-1.0.4"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.8.2" // {
+          (sources."ajv-4.9.0" // {
             dependencies = [
               sources."co-4.6.0"
             ];
@@ -23260,7 +23493,7 @@ in
     dependencies = [
       sources."bower-endpoint-parser-0.2.1"
       sources."bower-logger-0.2.1"
-      sources."bower-1.7.9"
+      sources."bower-1.8.0"
       (sources."glob-3.2.11" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -23450,7 +23683,7 @@ in
               (sources."readdirp-2.1.0" // {
                 dependencies = [
                   sources."graceful-fs-4.1.10"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -23478,12 +23711,12 @@ in
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.0" // {
+                      (sources."npmlog-4.0.1" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.1.5" // {
+                              (sources."readable-stream-2.2.2" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -23496,7 +23729,7 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.6.0" // {
+                          (sources."gauge-2.7.1" // {
                             dependencies = [
                               sources."aproba-1.0.4"
                               sources."has-color-0.1.7"
@@ -23532,7 +23765,7 @@ in
                           sources."strip-json-comments-1.0.4"
                         ];
                       })
-                      (sources."request-2.78.0" // {
+                      (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
                           sources."aws4-1.5.0"
@@ -23544,7 +23777,7 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.1.1" // {
+                          (sources."form-data-2.1.2" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
@@ -23628,12 +23861,11 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.12" // {
+                          (sources."mime-types-2.1.13" // {
                             dependencies = [
-                              sources."mime-db-1.24.0"
+                              sources."mime-db-1.25.0"
                             ];
                           })
-                          sources."node-uuid-1.4.7"
                           sources."oauth-sign-0.8.2"
                           sources."qs-6.3.0"
                           sources."stringstream-0.0.5"
@@ -23643,6 +23875,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
+                          sources."uuid-3.0.0"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -23944,7 +24177,7 @@ in
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
-          (sources."clean-css-3.4.20" // {
+          (sources."clean-css-3.4.21" // {
             dependencies = [
               (sources."commander-2.8.1" // {
                 dependencies = [
@@ -24083,7 +24316,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.6"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -24133,7 +24366,7 @@ in
         dependencies = [
           sources."array-differ-1.0.0"
           sources."array-uniq-1.0.3"
-          sources."beeper-1.1.0"
+          sources."beeper-1.1.1"
           (sources."dateformat-1.0.12" // {
             dependencies = [
               sources."get-stdin-4.0.1"
@@ -24445,7 +24678,7 @@ in
                               sources."os-tmpdir-1.0.2"
                             ];
                           })
-                          (sources."which-1.2.11" // {
+                          (sources."which-1.2.12" // {
                             dependencies = [
                               sources."isexe-1.1.2"
                             ];
@@ -24504,7 +24737,7 @@ in
         ];
       })
       sources."minimist-1.2.0"
-      (sources."orchestrator-0.3.7" // {
+      (sources."orchestrator-0.3.8" // {
         dependencies = [
           (sources."end-of-stream-0.1.5" // {
             dependencies = [
@@ -24519,7 +24752,7 @@ in
           sources."stream-consume-0.1.0"
         ];
       })
-      sources."pretty-hrtime-1.0.2"
+      sources."pretty-hrtime-1.0.3"
       sources."semver-4.3.6"
       (sources."tildify-1.2.0" // {
         dependencies = [
@@ -24852,7 +25085,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      (sources."handlebars-4.0.5" // {
+      (sources."handlebars-4.0.6" // {
         dependencies = [
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -24917,7 +25150,7 @@ in
           })
         ];
       })
-      (sources."js-yaml-3.6.1" // {
+      (sources."js-yaml-3.7.0" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -24943,7 +25176,7 @@ in
           sources."has-flag-1.0.0"
         ];
       })
-      (sources."which-1.2.11" // {
+      (sources."which-1.2.12" // {
         dependencies = [
           sources."isexe-1.1.2"
         ];
@@ -25093,10 +25326,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.6.1";
+    version = "3.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-      sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
     };
     dependencies = [
       (sources."argparse-1.0.9" // {
@@ -25134,11 +25367,11 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.0" // {
+          (sources."http-errors-1.5.1" // {
             dependencies = [
-              sources."inherits-2.0.1"
-              sources."setprototypeof-1.0.1"
-              sources."statuses-1.3.0"
+              sources."inherits-2.0.3"
+              sources."setprototypeof-1.0.2"
+              sources."statuses-1.3.1"
             ];
           })
           sources."iconv-lite-0.4.13"
@@ -25153,12 +25386,12 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -25256,7 +25489,7 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -25284,12 +25517,12 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.0" // {
+                  (sources."npmlog-4.0.1" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -25302,7 +25535,7 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.6.0" // {
+                      (sources."gauge-2.7.1" // {
                         dependencies = [
                           sources."aproba-1.0.4"
                           sources."has-color-0.1.7"
@@ -25338,7 +25571,7 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.78.0" // {
+                  (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
                       sources."aws4-1.5.0"
@@ -25350,7 +25583,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.1.1" // {
+                      (sources."form-data-2.1.2" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -25434,12 +25667,11 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
-                      sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
                       sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
@@ -25449,6 +25681,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
+                      sources."uuid-3.0.0"
                     ];
                   })
                   sources."semver-5.3.0"
@@ -25494,7 +25727,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.16.6"
+          sources."lodash-4.17.2"
         ];
       })
       (sources."connect-3.5.0" // {
@@ -25512,7 +25745,7 @@ in
                   sources."ee-first-1.1.1"
                 ];
               })
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -25800,9 +26033,9 @@ in
                 dependencies = [
                   (sources."accepts-1.2.13" // {
                     dependencies = [
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.5.3"
@@ -25810,7 +26043,7 @@ in
                   })
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -25822,12 +26055,12 @@ in
               })
               (sources."csurf-1.8.3" // {
                 dependencies = [
-                  (sources."csrf-3.0.3" // {
+                  (sources."csrf-3.0.4" // {
                     dependencies = [
-                      sources."base64-url-1.2.2"
+                      sources."base64-url-1.3.3"
                       sources."rndm-1.2.0"
                       sources."tsscmp-1.0.5"
-                      (sources."uid-safe-2.1.1" // {
+                      (sources."uid-safe-2.1.3" // {
                         dependencies = [
                           sources."random-bytes-1.0.0"
                         ];
@@ -25840,9 +26073,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -25874,11 +26107,16 @@ in
               (sources."http-errors-1.3.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."statuses-1.3.0"
+                  sources."statuses-1.3.1"
                 ];
               })
-              (sources."method-override-2.3.6" // {
+              (sources."method-override-2.3.7" // {
                 dependencies = [
+                  (sources."debug-2.3.3" // {
+                    dependencies = [
+                      sources."ms-0.7.2"
+                    ];
+                  })
                   sources."vary-1.1.0"
                 ];
               })
@@ -25907,10 +26145,14 @@ in
               sources."on-headers-1.0.1"
               sources."pause-0.1.0"
               sources."qs-4.0.0"
-              sources."response-time-2.3.1"
-              (sources."serve-favicon-2.3.0" // {
+              (sources."response-time-2.3.2" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."depd-1.1.0"
+                ];
+              })
+              (sources."serve-favicon-2.3.2" // {
+                dependencies = [
+                  sources."ms-0.7.2"
                 ];
               })
               (sources."serve-index-1.7.3" // {
@@ -25922,9 +26164,9 @@ in
                   })
                   sources."batch-0.5.3"
                   sources."escape-html-1.0.3"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -25948,12 +26190,12 @@ in
                   })
                 ];
               })
-              (sources."type-is-1.6.13" // {
+              (sources."type-is-1.6.14" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -26050,7 +26292,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.6"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -26277,12 +26519,12 @@ in
             ];
           })
           sources."object-assign-4.1.0"
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -26448,7 +26690,7 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.78.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
@@ -26460,7 +26702,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -26544,12 +26786,11 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
@@ -26559,6 +26800,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
           sources."retry-0.8.0"
@@ -26594,12 +26836,12 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
                       sources."string_decoder-0.10.31"
                       sources."util-deprecate-1.0.2"
@@ -26813,12 +27055,12 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -26865,9 +27107,9 @@ in
         dependencies = [
           (sources."array-index-1.0.0" // {
             dependencies = [
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
               (sources."es6-symbol-3.1.0" // {
@@ -26884,7 +27126,7 @@ in
           })
         ];
       })
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -26896,7 +27138,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.1" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -26980,12 +27222,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -26995,6 +27236,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
         ];
       })
       sources."rimraf-2.5.4"
@@ -27005,7 +27247,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."which-1.2.11" // {
+      (sources."which-1.2.12" // {
         dependencies = [
           sources."isexe-1.1.2"
         ];
@@ -27076,7 +27318,7 @@ in
                 dependencies = [
                   (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."big-integer-1.6.16"
+                      sources."big-integer-1.6.17"
                     ];
                   })
                   (sources."meow-3.7.0" // {
@@ -27209,18 +27451,18 @@ in
           })
         ];
       })
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       (sources."express-4.14.0" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -27231,13 +27473,18 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
           (sources."finalhandler-0.5.0" // {
             dependencies = [
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -27262,24 +27509,24 @@ in
           (sources."send-0.14.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.0" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
-                  sources."inherits-2.0.1"
-                  sources."setprototypeof-1.0.1"
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
             ];
           })
           sources."serve-static-1.11.1"
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -27323,11 +27570,11 @@ in
         ];
       })
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.3.0" // {
+      (sources."serve-favicon-2.3.2" // {
         dependencies = [
           sources."etag-1.7.0"
           sources."fresh-0.3.0"
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
           sources."parseurl-1.3.1"
         ];
       })
@@ -27351,17 +27598,17 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.0" // {
+              (sources."npmlog-4.0.1" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
+                          sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
                           sources."string_decoder-0.10.31"
                           sources."util-deprecate-1.0.2"
@@ -27370,7 +27617,7 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.6.0" // {
+                  (sources."gauge-2.7.1" // {
                     dependencies = [
                       sources."aproba-1.0.4"
                       sources."has-color-0.1.7"
@@ -27398,7 +27645,7 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.78.0" // {
+              (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.5.0"
@@ -27410,7 +27657,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.1" // {
+                  (sources."form-data-2.1.2" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -27494,12 +27741,11 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
-                  sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
                   sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
@@ -27509,6 +27755,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
+                  sources."uuid-3.0.0"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -27555,6 +27802,11 @@ in
               })
               (sources."tar-pack-3.3.0" // {
                 dependencies = [
+                  (sources."debug-2.2.0" // {
+                    dependencies = [
+                      sources."ms-0.7.1"
+                    ];
+                  })
                   (sources."fstream-1.0.10" // {
                     dependencies = [
                       sources."graceful-fs-4.1.10"
@@ -27614,17 +27866,17 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.0" // {
+              (sources."npmlog-4.0.1" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
+                          sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
                           sources."string_decoder-0.10.31"
                           sources."util-deprecate-1.0.2"
@@ -27633,7 +27885,7 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.6.0" // {
+                  (sources."gauge-2.7.1" // {
                     dependencies = [
                       sources."aproba-1.0.4"
                       sources."has-color-0.1.7"
@@ -27661,7 +27913,7 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.78.0" // {
+              (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.5.0"
@@ -27673,7 +27925,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.1" // {
+                  (sources."form-data-2.1.2" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -27757,12 +28009,11 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
-                  sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
                   sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
@@ -27772,6 +28023,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
+                  sources."uuid-3.0.0"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -27818,6 +28070,11 @@ in
               })
               (sources."tar-pack-3.3.0" // {
                 dependencies = [
+                  (sources."debug-2.2.0" // {
+                    dependencies = [
+                      sources."ms-0.7.1"
+                    ];
+                  })
                   (sources."fstream-1.0.10" // {
                     dependencies = [
                       sources."graceful-fs-4.1.10"
@@ -27862,7 +28119,7 @@ in
           })
         ];
       })
-      (sources."which-1.2.11" // {
+      (sources."which-1.2.12" // {
         dependencies = [
           sources."isexe-1.1.2"
         ];
@@ -27942,17 +28199,17 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-4.0.0" // {
+      (sources."npmlog-4.0.1" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -27961,7 +28218,7 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.6.0" // {
+          (sources."gauge-2.7.1" // {
             dependencies = [
               sources."aproba-1.0.4"
               sources."has-color-0.1.7"
@@ -27997,7 +28254,7 @@ in
           sources."strip-json-comments-1.0.4"
         ];
       })
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -28009,7 +28266,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.1" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -28093,12 +28350,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -28108,6 +28364,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
         ];
       })
       (sources."rimraf-2.5.4" // {
@@ -28310,7 +28567,7 @@ in
           (sources."readdirp-2.1.0" // {
             dependencies = [
               sources."graceful-fs-4.1.10"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -28338,12 +28595,12 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.0" // {
+                  (sources."npmlog-4.0.1" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -28356,7 +28613,7 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.6.0" // {
+                      (sources."gauge-2.7.1" // {
                         dependencies = [
                           sources."aproba-1.0.4"
                           sources."has-color-0.1.7"
@@ -28392,7 +28649,7 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.78.0" // {
+                  (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
                       sources."aws4-1.5.0"
@@ -28404,7 +28661,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.1.1" // {
+                      (sources."form-data-2.1.2" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -28488,12 +28745,11 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
-                      sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
                       sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
@@ -28503,6 +28759,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
+                      sources."uuid-3.0.0"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
@@ -28537,6 +28794,11 @@ in
                   })
                   (sources."tar-pack-3.3.0" // {
                     dependencies = [
+                      (sources."debug-2.2.0" // {
+                        dependencies = [
+                          sources."ms-0.7.1"
+                        ];
+                      })
                       (sources."fstream-1.0.10" // {
                         dependencies = [
                           sources."graceful-fs-4.1.10"
@@ -28567,9 +28829,9 @@ in
           })
         ];
       })
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       sources."es6-promise-3.3.1"
@@ -28703,7 +28965,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -28734,12 +28996,12 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
                               sources."isarray-1.0.0"
+                              sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
                               sources."string_decoder-0.10.31"
                               sources."util-deprecate-1.0.2"
@@ -28821,11 +29083,11 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.0" // {
+          (sources."http-errors-1.5.1" // {
             dependencies = [
-              sources."inherits-2.0.1"
-              sources."setprototypeof-1.0.1"
-              sources."statuses-1.3.0"
+              sources."inherits-2.0.3"
+              sources."setprototypeof-1.0.2"
+              sources."statuses-1.3.1"
             ];
           })
           sources."iconv-lite-0.4.13"
@@ -28835,11 +29097,11 @@ in
             ];
           })
           sources."qs-6.2.0"
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -28872,7 +29134,7 @@ in
               sources."domhandler-2.3.0"
               sources."domutils-1.5.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -28912,9 +29174,9 @@ in
       })
       (sources."cron-1.1.1" // {
         dependencies = [
-          (sources."moment-timezone-0.5.7" // {
+          (sources."moment-timezone-0.5.9" // {
             dependencies = [
-              sources."moment-2.15.2"
+              sources."moment-2.16.0"
             ];
           })
         ];
@@ -28923,9 +29185,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -28947,7 +29209,7 @@ in
           sources."etag-1.7.0"
           (sources."finalhandler-0.5.0" // {
             dependencies = [
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -28972,23 +29234,23 @@ in
           (sources."send-0.14.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.0" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
-                  sources."inherits-2.0.1"
-                  sources."setprototypeof-1.0.1"
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
             ];
           })
           sources."serve-static-1.11.1"
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -28999,9 +29261,9 @@ in
       })
       (sources."follow-redirects-0.2.0" // {
         dependencies = [
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."stream-consume-0.1.0"
@@ -29053,7 +29315,7 @@ in
       })
       (sources."i18next-1.10.6" // {
         dependencies = [
-          (sources."cookies-0.6.1" // {
+          (sources."cookies-0.6.2" // {
             dependencies = [
               sources."depd-1.1.0"
               sources."keygrip-1.0.1"
@@ -29212,7 +29474,7 @@ in
                   (sources."ordered-read-streams-0.3.0" // {
                     dependencies = [
                       sources."is-stream-1.1.0"
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -29324,7 +29586,7 @@ in
               })
             ];
           })
-          (sources."websocket-stream-3.3.0" // {
+          (sources."websocket-stream-3.3.3" // {
             dependencies = [
               (sources."duplexify-3.5.0" // {
                 dependencies = [
@@ -29337,7 +29599,7 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -29384,9 +29646,9 @@ in
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
         ];
@@ -29500,12 +29762,12 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.6"
+              sources."lodash-4.17.2"
             ];
           })
         ];
       })
-      (sources."node-red-node-feedparser-0.1.6" // {
+      (sources."node-red-node-feedparser-0.1.7" // {
         dependencies = [
           (sources."feedparser-1.1.3" // {
             dependencies = [
@@ -29552,7 +29814,7 @@ in
                 dependencies = [
                   (sources."async-2.1.2" // {
                     dependencies = [
-                      sources."lodash-4.16.6"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
@@ -29636,9 +29898,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -29655,7 +29917,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.11" // {
+      (sources."node-red-node-email-0.1.12" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -29675,9 +29937,9 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.2.0" // {
+                          (sources."debug-2.3.3" // {
                             dependencies = [
-                              sources."ms-0.7.1"
+                              sources."ms-0.7.2"
                             ];
                           })
                           sources."iconv-lite-0.4.13"
@@ -29689,9 +29951,9 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.2.0" // {
+                  (sources."debug-2.3.3" // {
                     dependencies = [
-                      sources."ms-0.7.1"
+                      sources."ms-0.7.2"
                     ];
                   })
                   sources."iconv-lite-0.4.13"
@@ -29734,7 +29996,7 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              (sources."uue-3.0.0" // {
+              (sources."uue-3.1.0" // {
                 dependencies = [
                   sources."extend-3.0.0"
                 ];
@@ -29756,11 +30018,11 @@ in
           })
         ];
       })
-      (sources."node-red-node-twitter-0.1.7" // {
+      (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."twitter-ng-0.6.2"
           sources."oauth-0.9.14"
-          (sources."request-2.78.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
@@ -29772,7 +30034,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -29856,12 +30118,11 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
@@ -29871,14 +30132,15 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
         ];
       })
-      sources."node-red-node-rbe-0.1.5"
-      (sources."node-red-node-serialport-0.4.0" // {
+      sources."node-red-node-rbe-0.1.6"
+      (sources."node-red-node-serialport-0.4.1" // {
         dependencies = [
-          (sources."serialport-4.0.4" // {
+          (sources."serialport-4.0.6" // {
             dependencies = [
               sources."bindings-1.2.1"
               (sources."commander-2.9.0" // {
@@ -29886,9 +30148,9 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
               (sources."lie-3.1.0" // {
@@ -29904,17 +30166,17 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."npmlog-4.0.0" // {
+                  (sources."npmlog-4.0.1" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.1.5" // {
+                          (sources."readable-stream-2.2.2" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
                               sources."isarray-1.0.0"
+                              sources."inherits-2.0.3"
                               sources."process-nextick-args-1.0.7"
                               sources."string_decoder-0.10.31"
                               sources."util-deprecate-1.0.2"
@@ -29923,7 +30185,7 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.6.0" // {
+                      (sources."gauge-2.7.1" // {
                         dependencies = [
                           sources."aproba-1.0.4"
                           sources."has-color-0.1.7"
@@ -29959,7 +30221,7 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.78.0" // {
+                  (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
                       sources."aws4-1.5.0"
@@ -29971,7 +30233,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.1.1" // {
+                      (sources."form-data-2.1.2" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -30050,12 +30312,11 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.12" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.24.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
-                      sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
                       sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
@@ -30065,6 +30326,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
+                      sources."uuid-3.0.0"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
@@ -30111,6 +30373,11 @@ in
                   })
                   (sources."tar-pack-3.3.0" // {
                     dependencies = [
+                      (sources."debug-2.2.0" // {
+                        dependencies = [
+                          sources."ms-0.7.1"
+                        ];
+                      })
                       (sources."fstream-1.0.10" // {
                         dependencies = [
                           sources."graceful-fs-4.1.10"
@@ -30228,7 +30495,7 @@ in
           sources."range-parser-0.0.4"
           sources."mkdirp-0.3.5"
           sources."cookie-0.0.5"
-          sources."buffer-crc32-0.2.5"
+          sources."buffer-crc32-0.2.6"
           sources."fresh-0.1.0"
           sources."methods-0.0.1"
           (sources."send-0.1.0" // {
@@ -30237,9 +30504,9 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
         ];
@@ -30347,7 +30614,7 @@ in
       })
       (sources."net-ping-1.1.7" // {
         dependencies = [
-          (sources."raw-socket-1.5.0" // {
+          (sources."raw-socket-1.5.1" // {
             dependencies = [
               sources."nan-2.3.5"
             ];
@@ -30376,12 +30643,18 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "3.10.9";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
-      sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
     };
     dependencies = [
+      (sources."JSONStream-1.2.1" // {
+        dependencies = [
+          sources."jsonparse-1.2.0"
+          sources."through-2.3.8"
+        ];
+      })
       sources."abbrev-1.0.9"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
@@ -30485,6 +30758,62 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
+      (sources."mississippi-1.2.0" // {
+        dependencies = [
+          (sources."concat-stream-1.5.2" // {
+            dependencies = [
+              sources."typedarray-0.0.6"
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."duplexify-3.5.0" // {
+            dependencies = [
+              (sources."end-of-stream-1.0.0" // {
+                dependencies = [
+                  sources."once-1.3.3"
+                ];
+              })
+              sources."stream-shift-1.0.0"
+            ];
+          })
+          (sources."end-of-stream-1.1.0" // {
+            dependencies = [
+              sources."once-1.3.3"
+            ];
+          })
+          sources."flush-write-stream-1.0.2"
+          sources."from2-2.3.0"
+          sources."pump-1.0.1"
+          sources."pumpify-1.3.5"
+          (sources."stream-each-1.2.0" // {
+            dependencies = [
+              sources."stream-shift-1.0.0"
+            ];
+          })
+          (sources."through2-2.0.1" // {
+            dependencies = [
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+              sources."xtend-4.0.1"
+            ];
+          })
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -30535,9 +30864,9 @@ in
             dependencies = [
               (sources."array-index-1.0.0" // {
                 dependencies = [
-                  (sources."debug-2.2.0" // {
+                  (sources."debug-2.3.3" // {
                     dependencies = [
-                      sources."ms-0.7.1"
+                      sources."ms-0.7.2"
                     ];
                   })
                   (sources."es6-symbol-3.1.0" // {
@@ -30570,7 +30899,7 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.2.1" // {
+      (sources."npm-registry-client-7.3.0" // {
         dependencies = [
           (sources."concat-stream-1.5.2" // {
             dependencies = [
@@ -30618,7 +30947,7 @@ in
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.0" // {
+      (sources."npmlog-4.0.1" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -30626,7 +30955,7 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.6.0" // {
+          (sources."gauge-2.7.1" // {
             dependencies = [
               sources."has-color-0.1.7"
               sources."object-assign-4.1.0"
@@ -30703,23 +31032,10 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.75.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -30728,7 +31044,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.0.0" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -30803,14 +31119,14 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -30826,6 +31142,26 @@ in
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
+      (sources."sorted-union-stream-2.1.3" // {
+        dependencies = [
+          (sources."from2-1.3.0" // {
+            dependencies = [
+              (sources."readable-stream-1.1.14" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-0.0.1"
+                  sources."string_decoder-0.10.31"
+                ];
+              })
+            ];
+          })
+          (sources."stream-iterate-1.2.0" // {
+            dependencies = [
+              sources."stream-shift-1.0.0"
+            ];
+          })
+        ];
+      })
       sources."strip-ansi-3.0.1"
       (sources."tar-2.2.1" // {
         dependencies = [
@@ -30846,7 +31182,7 @@ in
           sources."builtins-0.0.7"
         ];
       })
-      (sources."which-1.2.11" // {
+      (sources."which-1.2.12" // {
         dependencies = [
           sources."isexe-1.1.2"
         ];
@@ -30901,7 +31237,7 @@ in
       })
       (sources."npm-registry-client-0.2.27" // {
         dependencies = [
-          (sources."request-2.78.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
@@ -30913,7 +31249,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -30997,12 +31333,11 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
@@ -31012,6 +31347,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
           sources."graceful-fs-2.0.3"
@@ -31052,17 +31388,17 @@ in
           })
           sources."retry-0.6.0"
           sources."couch-login-0.1.20"
-          (sources."npmlog-4.0.0" // {
+          (sources."npmlog-4.0.1" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
                       sources."string_decoder-0.10.31"
                       sources."util-deprecate-1.0.2"
@@ -31071,7 +31407,7 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
+              (sources."gauge-2.7.1" // {
                 dependencies = [
                   sources."aproba-1.0.4"
                   sources."has-color-0.1.7"
@@ -31269,9 +31605,9 @@ in
           sources."jju-1.3.0"
         ];
       })
-      sources."lodash-4.16.6"
+      sources."lodash-4.17.2"
       sources."node-alias-1.0.4"
-      (sources."npm-3.10.9" // {
+      (sources."npm-3.10.10" // {
         dependencies = [
           sources."abbrev-1.0.9"
           sources."ansicolors-0.3.2"
@@ -31426,9 +31762,9 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.2.0" // {
+                      (sources."debug-2.3.3" // {
                         dependencies = [
-                          sources."ms-0.7.1"
+                          sources."ms-0.7.2"
                         ];
                       })
                       (sources."es6-symbol-3.1.0" // {
@@ -31509,7 +31845,7 @@ in
             ];
           })
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-4.0.0" // {
+          (sources."npmlog-4.0.1" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -31517,7 +31853,7 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
+              (sources."gauge-2.7.1" // {
                 dependencies = [
                   sources."has-color-0.1.7"
                   sources."object-assign-4.1.0"
@@ -31676,9 +32012,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -31718,7 +32054,7 @@ in
               sources."builtins-0.0.7"
             ];
           })
-          (sources."which-1.2.11" // {
+          (sources."which-1.2.12" // {
             dependencies = [
               sources."isexe-1.1.2"
             ];
@@ -31855,12 +32191,12 @@ in
                         ];
                       })
                       sources."read-all-stream-3.1.0"
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
+                          sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
                           sources."string_decoder-0.10.31"
                           sources."util-deprecate-1.0.2"
@@ -31924,10 +32260,10 @@ in
   parsoid = nodeEnv.buildNodePackage {
     name = "parsoid";
     packageName = "parsoid";
-    version = "0.5.3";
+    version = "0.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.5.3.tgz";
-      sha1 = "f1dea92c78b80f6af02d3652025e31fd8a81efde";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
+      sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
     };
     dependencies = [
       sources."async-0.9.2"
@@ -31947,11 +32283,11 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.0" // {
+          (sources."http-errors-1.5.1" // {
             dependencies = [
-              sources."inherits-2.0.1"
-              sources."setprototypeof-1.0.1"
-              sources."statuses-1.3.0"
+              sources."inherits-2.0.3"
+              sources."setprototypeof-1.0.2"
+              sources."statuses-1.3.1"
             ];
           })
           sources."iconv-lite-0.4.13"
@@ -31966,85 +32302,33 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
-                ];
-              })
-            ];
-          })
-        ];
-      })
-      (sources."bunyan-1.8.4" // {
-        dependencies = [
-          (sources."dtrace-provider-0.7.1" // {
-            dependencies = [
-              sources."nan-2.4.0"
-            ];
-          })
-          (sources."mv-2.1.1" // {
-            dependencies = [
-              (sources."mkdirp-0.5.1" // {
-                dependencies = [
-                  sources."minimist-0.0.8"
-                ];
-              })
-              sources."ncp-2.0.0"
-              (sources."rimraf-2.4.5" // {
-                dependencies = [
-                  (sources."glob-6.0.4" // {
-                    dependencies = [
-                      (sources."inflight-1.0.6" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.3" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
-                            dependencies = [
-                              sources."balanced-match-0.4.2"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      sources."path-is-absolute-1.0.1"
-                    ];
-                  })
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
           })
-          sources."safe-json-stringify-1.0.3"
-          sources."moment-2.15.2"
         ];
       })
       (sources."compression-1.6.2" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."negotiator-0.6.1"
             ];
           })
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -32077,7 +32361,8 @@ in
           })
         ];
       })
-      sources."core-js-1.2.7"
+      sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+      sources."core-js-2.4.1"
       sources."diff-1.4.0"
       sources."domino-1.0.27"
       sources."entities-1.1.1"
@@ -32085,12 +32370,11 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."negotiator-0.6.1"
             ];
           })
           sources."array-flatten-1.1.1"
@@ -32109,7 +32393,7 @@ in
           sources."etag-1.7.0"
           (sources."finalhandler-0.5.0" // {
             dependencies = [
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -32134,24 +32418,24 @@ in
           (sources."send-0.14.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.0" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
-                  sources."inherits-2.0.1"
-                  sources."setprototypeof-1.0.1"
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
             ];
           })
           sources."serve-static-1.11.1"
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -32160,9 +32444,9 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."express-handlebars-2.0.1" // {
+      (sources."express-handlebars-3.0.0" // {
         dependencies = [
-          (sources."glob-5.0.15" // {
+          (sources."glob-6.0.4" // {
             dependencies = [
               (sources."inflight-1.0.6" // {
                 dependencies = [
@@ -32188,49 +32472,92 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          (sources."graceful-fs-3.0.11" // {
-            dependencies = [
-              sources."natives-1.1.0"
-            ];
-          })
-          (sources."handlebars-3.0.3" // {
+          sources."graceful-fs-4.1.10"
+          (sources."handlebars-4.0.6" // {
             dependencies = [
+              sources."async-1.5.2"
               (sources."optimist-0.6.1" // {
                 dependencies = [
                   sources."wordwrap-0.0.3"
                   sources."minimist-0.0.10"
                 ];
               })
-              (sources."source-map-0.1.43" // {
+              (sources."source-map-0.4.4" // {
                 dependencies = [
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.3.6" // {
+              (sources."uglify-js-2.7.4" // {
                 dependencies = [
                   sources."async-0.2.10"
-                  (sources."optimist-0.3.7" // {
+                  sources."source-map-0.5.6"
+                  sources."uglify-to-browserify-1.0.2"
+                  (sources."yargs-3.10.0" // {
                     dependencies = [
-                      sources."wordwrap-0.0.3"
+                      sources."camelcase-1.2.1"
+                      (sources."cliui-2.1.0" // {
+                        dependencies = [
+                          (sources."center-align-0.1.3" // {
+                            dependencies = [
+                              (sources."align-text-0.1.4" // {
+                                dependencies = [
+                                  (sources."kind-of-3.0.4" // {
+                                    dependencies = [
+                                      sources."is-buffer-1.1.4"
+                                    ];
+                                  })
+                                  sources."longest-1.0.1"
+                                  sources."repeat-string-1.6.1"
+                                ];
+                              })
+                              sources."lazy-cache-1.0.4"
+                            ];
+                          })
+                          (sources."right-align-0.1.3" // {
+                            dependencies = [
+                              (sources."align-text-0.1.4" // {
+                                dependencies = [
+                                  (sources."kind-of-3.0.4" // {
+                                    dependencies = [
+                                      sources."is-buffer-1.1.4"
+                                    ];
+                                  })
+                                  sources."longest-1.0.1"
+                                  sources."repeat-string-1.6.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."wordwrap-0.0.2"
+                        ];
+                      })
+                      sources."decamelize-1.2.0"
+                      sources."window-size-0.1.0"
                     ];
                   })
                 ];
               })
             ];
           })
-          (sources."object.assign-1.1.1" // {
+          (sources."object.assign-4.0.4" // {
             dependencies = [
+              sources."function-bind-1.1.0"
               sources."object-keys-1.0.11"
+              (sources."define-properties-1.1.2" // {
+                dependencies = [
+                  sources."foreach-2.0.5"
+                ];
+              })
             ];
           })
-          (sources."promise-6.1.0" // {
+          (sources."promise-7.1.1" // {
             dependencies = [
-              sources."asap-1.0.0"
+              sources."asap-2.0.5"
             ];
           })
         ];
       })
-      (sources."finalhandler-0.4.1" // {
+      (sources."finalhandler-0.5.1" // {
         dependencies = [
           (sources."debug-2.2.0" // {
             dependencies = [
@@ -32243,6 +32570,7 @@ in
               sources."ee-first-1.1.1"
             ];
           })
+          sources."statuses-1.3.1"
           sources."unpipe-1.0.0"
         ];
       })
@@ -32251,61 +32579,22 @@ in
           sources."gelfling-0.2.0"
         ];
       })
-      (sources."html5-1.0.5" // {
+      (sources."js-yaml-3.7.0" // {
         dependencies = [
-          sources."opts-1.2.2"
-          sources."html5-entities-1.0.0"
-          (sources."jsdom-0.11.1" // {
+          (sources."argparse-1.0.9" // {
             dependencies = [
-              (sources."htmlparser2-3.9.2" // {
-                dependencies = [
-                  sources."domelementtype-1.3.0"
-                  sources."domhandler-2.3.0"
-                  (sources."domutils-1.5.1" // {
-                    dependencies = [
-                      (sources."dom-serializer-0.1.0" // {
-                        dependencies = [
-                          sources."domelementtype-1.1.3"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."inherits-2.0.3"
-                  (sources."readable-stream-2.1.5" // {
-                    dependencies = [
-                      sources."buffer-shims-1.0.0"
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."nwmatcher-1.3.9"
-              sources."xmlhttprequest-1.8.0"
-              sources."cssom-0.3.1"
-              sources."cssstyle-0.2.37"
-              (sources."contextify-0.1.15" // {
-                dependencies = [
-                  sources."bindings-1.2.1"
-                  sources."nan-2.4.0"
-                ];
-              })
+              sources."sprintf-js-1.0.3"
             ];
           })
+          sources."esprima-2.7.3"
         ];
       })
-      sources."node-txstatsd-0.1.6"
+      sources."mediawiki-title-0.5.6"
+      sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.7"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
-      (sources."prfun-2.1.4" // {
-        dependencies = [
-          sources."core-js-2.4.1"
-        ];
-      })
-      (sources."request-2.78.0" // {
+      sources."prfun-2.1.4"
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -32317,7 +32606,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.1" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -32401,9 +32690,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -32415,19 +32704,385 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.3.0" // {
+      (sources."serve-favicon-2.3.2" // {
         dependencies = [
           sources."etag-1.7.0"
           sources."fresh-0.3.0"
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
           sources."parseurl-1.3.1"
         ];
       })
+      (sources."service-runner-2.1.11" // {
+        dependencies = [
+          sources."bluebird-3.4.6"
+          (sources."bunyan-1.8.5" // {
+            dependencies = [
+              (sources."dtrace-provider-0.8.0" // {
+                dependencies = [
+                  sources."nan-2.4.0"
+                ];
+              })
+              (sources."mv-2.1.1" // {
+                dependencies = [
+                  (sources."mkdirp-0.5.1" // {
+                    dependencies = [
+                      sources."minimist-0.0.8"
+                    ];
+                  })
+                  sources."ncp-2.0.0"
+                  (sources."rimraf-2.4.5" // {
+                    dependencies = [
+                      (sources."glob-6.0.4" // {
+                        dependencies = [
+                          (sources."inflight-1.0.6" // {
+                            dependencies = [
+                              sources."wrappy-1.0.2"
+                            ];
+                          })
+                          sources."inherits-2.0.3"
+                          (sources."minimatch-3.0.3" // {
+                            dependencies = [
+                              (sources."brace-expansion-1.1.6" // {
+                                dependencies = [
+                                  sources."balanced-match-0.4.2"
+                                  sources."concat-map-0.0.1"
+                                ];
+                              })
+                            ];
+                          })
+                          (sources."once-1.4.0" // {
+                            dependencies = [
+                              sources."wrappy-1.0.2"
+                            ];
+                          })
+                          sources."path-is-absolute-1.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              sources."safe-json-stringify-1.0.3"
+              sources."moment-2.16.0"
+            ];
+          })
+          sources."bunyan-syslog-udp-0.1.0"
+          sources."extend-3.0.0"
+          (sources."gelf-stream-1.1.1" // {
+            dependencies = [
+              sources."gelfling-0.3.1"
+            ];
+          })
+          sources."hot-shots-4.3.1"
+          (sources."limitation-0.1.9" // {
+            dependencies = [
+              (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
+                dependencies = [
+                  sources."clarinet-0.11.0"
+                  sources."colors-1.1.2"
+                  sources."hat-0.0.3"
+                  sources."kad-fs-0.0.4"
+                  (sources."kad-localstorage-0.0.7" // {
+                    dependencies = [
+                      sources."dom-storage-2.0.2"
+                    ];
+                  })
+                  sources."kad-memstore-0.0.1"
+                  sources."lodash-3.10.1"
+                  sources."merge-1.2.0"
+                  sources."ms-0.7.2"
+                  (sources."msgpack5-3.4.1" // {
+                    dependencies = [
+                      (sources."bl-1.1.2" // {
+                        dependencies = [
+                          (sources."readable-stream-2.0.6" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                              sources."isarray-1.0.0"
+                              sources."process-nextick-args-1.0.7"
+                              sources."string_decoder-0.10.31"
+                              sources."util-deprecate-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."inherits-2.0.3"
+                    ];
+                  })
+                ];
+              })
+              (sources."readable-stream-2.2.2" // {
+                dependencies = [
+                  sources."buffer-shims-1.0.0"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."yargs-5.0.0" // {
+            dependencies = [
+              (sources."cliui-3.2.0" // {
+                dependencies = [
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.0.0"
+                    ];
+                  })
+                  sources."wrap-ansi-2.0.0"
+                ];
+              })
+              sources."decamelize-1.2.0"
+              sources."get-caller-file-1.0.2"
+              sources."lodash.assign-4.2.0"
+              (sources."os-locale-1.4.0" // {
+                dependencies = [
+                  (sources."lcid-1.0.0" // {
+                    dependencies = [
+                      sources."invert-kv-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."read-pkg-up-1.0.1" // {
+                dependencies = [
+                  (sources."find-up-1.1.2" // {
+                    dependencies = [
+                      sources."path-exists-2.1.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."read-pkg-1.1.0" // {
+                    dependencies = [
+                      (sources."load-json-file-1.1.0" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.10"
+                          (sources."parse-json-2.2.0" // {
+                            dependencies = [
+                              (sources."error-ex-1.3.0" // {
+                                dependencies = [
+                                  sources."is-arrayish-0.2.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."pify-2.3.0"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                          (sources."strip-bom-2.0.0" // {
+                            dependencies = [
+                              sources."is-utf8-0.2.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."normalize-package-data-2.3.5" // {
+                        dependencies = [
+                          sources."hosted-git-info-2.1.5"
+                          (sources."is-builtin-module-1.0.0" // {
+                            dependencies = [
+                              sources."builtin-modules-1.1.1"
+                            ];
+                          })
+                          (sources."validate-npm-package-license-3.0.1" // {
+                            dependencies = [
+                              (sources."spdx-correct-1.0.2" // {
+                                dependencies = [
+                                  sources."spdx-license-ids-1.2.2"
+                                ];
+                              })
+                              sources."spdx-expression-parse-1.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."path-type-1.1.0" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.10"
+                          sources."pify-2.3.0"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              sources."require-directory-2.1.1"
+              sources."require-main-filename-1.0.1"
+              sources."set-blocking-2.0.0"
+              (sources."string-width-1.0.2" // {
+                dependencies = [
+                  sources."code-point-at-1.1.0"
+                  (sources."is-fullwidth-code-point-1.0.0" // {
+                    dependencies = [
+                      sources."number-is-nan-1.0.1"
+                    ];
+                  })
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."which-module-1.0.0"
+              sources."window-size-0.2.0"
+              sources."y18n-3.2.1"
+              (sources."yargs-parser-3.2.0" // {
+                dependencies = [
+                  sources."camelcase-3.0.0"
+                ];
+              })
+            ];
+          })
+        ];
+      })
       sources."simplediff-0.1.1"
-      sources."yargs-1.3.3"
+      (sources."yargs-4.8.1" // {
+        dependencies = [
+          (sources."cliui-3.2.0" // {
+            dependencies = [
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.0.0"
+                ];
+              })
+              sources."wrap-ansi-2.0.0"
+            ];
+          })
+          sources."decamelize-1.2.0"
+          sources."get-caller-file-1.0.2"
+          sources."lodash.assign-4.2.0"
+          (sources."os-locale-1.4.0" // {
+            dependencies = [
+              (sources."lcid-1.0.0" // {
+                dependencies = [
+                  sources."invert-kv-1.0.0"
+                ];
+              })
+            ];
+          })
+          (sources."read-pkg-up-1.0.1" // {
+            dependencies = [
+              (sources."find-up-1.1.2" // {
+                dependencies = [
+                  sources."path-exists-2.1.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."read-pkg-1.1.0" // {
+                dependencies = [
+                  (sources."load-json-file-1.1.0" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.10"
+                      (sources."parse-json-2.2.0" // {
+                        dependencies = [
+                          (sources."error-ex-1.3.0" // {
+                            dependencies = [
+                              sources."is-arrayish-0.2.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."pify-2.3.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                      (sources."strip-bom-2.0.0" // {
+                        dependencies = [
+                          sources."is-utf8-0.2.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."normalize-package-data-2.3.5" // {
+                    dependencies = [
+                      sources."hosted-git-info-2.1.5"
+                      (sources."is-builtin-module-1.0.0" // {
+                        dependencies = [
+                          sources."builtin-modules-1.1.1"
+                        ];
+                      })
+                      (sources."validate-npm-package-license-3.0.1" // {
+                        dependencies = [
+                          (sources."spdx-correct-1.0.2" // {
+                            dependencies = [
+                              sources."spdx-license-ids-1.2.2"
+                            ];
+                          })
+                          sources."spdx-expression-parse-1.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."path-type-1.1.0" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.10"
+                      sources."pify-2.3.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."require-directory-2.1.1"
+          sources."require-main-filename-1.0.1"
+          sources."set-blocking-2.0.0"
+          (sources."string-width-1.0.2" // {
+            dependencies = [
+              sources."code-point-at-1.1.0"
+              (sources."is-fullwidth-code-point-1.0.0" // {
+                dependencies = [
+                  sources."number-is-nan-1.0.1"
+                ];
+              })
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.0.0"
+                ];
+              })
+            ];
+          })
+          sources."which-module-1.0.0"
+          sources."window-size-0.2.0"
+          sources."y18n-3.2.1"
+          (sources."yargs-parser-2.4.1" // {
+            dependencies = [
+              sources."camelcase-3.0.0"
+            ];
+          })
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32457,7 +33112,7 @@ in
               })
               (sources."bplist-parser-0.1.1" // {
                 dependencies = [
-                  sources."big-integer-1.6.16"
+                  sources."big-integer-1.6.17"
                 ];
               })
               (sources."concat-stream-1.5.2" // {
@@ -32564,9 +33219,10 @@ in
               })
               (sources."multicast-dns-6.1.0" // {
                 dependencies = [
-                  (sources."dns-packet-1.1.0" // {
+                  (sources."dns-packet-1.1.1" // {
                     dependencies = [
                       sources."ip-1.1.4"
+                      sources."safe-buffer-5.0.1"
                     ];
                   })
                   sources."thunky-0.1.0"
@@ -32704,7 +33360,7 @@ in
         ];
       })
       sources."clivas-0.2.0"
-      (sources."inquirer-1.2.2" // {
+      (sources."inquirer-1.2.3" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
           (sources."chalk-1.1.3" // {
@@ -32766,7 +33422,7 @@ in
               sources."object-assign-4.1.0"
             ];
           })
-          sources."lodash-4.16.6"
+          sources."lodash-4.17.2"
           sources."mute-stream-0.0.6"
           (sources."pinkie-promise-2.0.1" // {
             dependencies = [
@@ -32812,7 +33468,7 @@ in
         dependencies = [
           sources."blob-to-buffer-1.2.6"
           sources."get-stdin-5.0.1"
-          (sources."magnet-uri-5.1.4" // {
+          (sources."magnet-uri-5.1.5" // {
             dependencies = [
               sources."thirty-two-1.0.2"
               sources."uniq-1.0.1"
@@ -33044,7 +33700,7 @@ in
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33058,7 +33714,7 @@ in
                   })
                   (sources."simple-websocket-4.1.0" // {
                     dependencies = [
-                      (sources."readable-stream-2.1.5" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33085,9 +33741,9 @@ in
                   })
                 ];
               })
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
               sources."inherits-2.0.3"
@@ -33112,10 +33768,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.0.30";
+    version = "0.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz";
-      sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
     };
     dependencies = [
       (sources."connect-multiparty-1.2.5" // {
@@ -33332,30 +33988,133 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."socket.io-0.9.17" // {
+      (sources."socket.io-1.6.0" // {
         dependencies = [
-          (sources."socket.io-client-0.9.16" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."uglify-js-1.2.5"
-              (sources."ws-0.4.32" // {
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."engine.io-1.8.0" // {
+            dependencies = [
+              (sources."accepts-1.3.3" // {
+                dependencies = [
+                  (sources."mime-types-2.1.13" // {
+                    dependencies = [
+                      sources."mime-db-1.25.0"
+                    ];
+                  })
+                  sources."negotiator-0.6.1"
+                ];
+              })
+              sources."base64id-0.1.0"
+              (sources."engine.io-parser-1.3.1" // {
+                dependencies = [
+                  sources."after-0.8.1"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.5"
+                  sources."blob-0.0.4"
+                  (sources."has-binary-0.1.6" // {
+                    dependencies = [
+                      sources."isarray-0.0.1"
+                    ];
+                  })
+                  sources."wtf-8-1.0.0"
+                ];
+              })
+              (sources."ws-1.1.1" // {
                 dependencies = [
-                  sources."commander-2.1.0"
-                  sources."nan-1.0.0"
-                  sources."tinycolor-0.0.1"
                   sources."options-0.0.6"
+                  sources."ultron-1.0.2"
                 ];
               })
-              sources."xmlhttprequest-1.4.2"
-              (sources."active-x-obfuscator-0.0.1" // {
+              sources."cookie-0.3.1"
+            ];
+          })
+          (sources."has-binary-0.1.7" // {
+            dependencies = [
+              sources."isarray-0.0.1"
+            ];
+          })
+          sources."object-assign-4.1.0"
+          sources."socket.io-adapter-0.5.0"
+          (sources."socket.io-client-1.6.0" // {
+            dependencies = [
+              sources."backo2-1.0.2"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.1"
+              (sources."engine.io-client-1.8.0" // {
                 dependencies = [
-                  sources."zeparser-0.0.5"
+                  sources."component-inherit-0.0.3"
+                  (sources."engine.io-parser-1.3.1" // {
+                    dependencies = [
+                      sources."after-0.8.1"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.5"
+                      sources."blob-0.0.4"
+                      (sources."has-binary-0.1.6" // {
+                        dependencies = [
+                          sources."isarray-0.0.1"
+                        ];
+                      })
+                      sources."wtf-8-1.0.0"
+                    ];
+                  })
+                  sources."has-cors-1.1.0"
+                  (sources."parsejson-0.0.3" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.5" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ws-1.1.1" // {
+                    dependencies = [
+                      sources."options-0.0.6"
+                      sources."ultron-1.0.2"
+                    ];
+                  })
+                  sources."xmlhttprequest-ssl-1.5.3"
+                  sources."yeast-0.1.2"
                 ];
               })
+              sources."indexof-0.0.1"
+              sources."object-component-0.0.3"
+              (sources."parseuri-0.0.5" // {
+                dependencies = [
+                  (sources."better-assert-1.0.2" // {
+                    dependencies = [
+                      sources."callsite-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."to-array-0.1.4"
+            ];
+          })
+          (sources."socket.io-parser-2.3.1" // {
+            dependencies = [
+              (sources."debug-2.2.0" // {
+                dependencies = [
+                  sources."ms-0.7.1"
+                ];
+              })
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
+              sources."isarray-0.0.1"
             ];
           })
-          sources."policyfile-0.0.4"
-          sources."base64id-0.1.0"
-          sources."redis-0.7.3"
         ];
       })
       (sources."torrent-stream-0.18.1" // {
@@ -33366,9 +34125,9 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
               sources."inherits-2.0.3"
@@ -33403,9 +34162,9 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
               sources."extend.js-0.0.2"
@@ -33547,10 +34306,10 @@ in
         dependencies = [
           (sources."async-2.1.2" // {
             dependencies = [
-              sources."lodash-4.16.6"
+              sources."lodash-4.17.2"
             ];
           })
-          (sources."which-1.2.11" // {
+          (sources."which-1.2.12" // {
             dependencies = [
               sources."isexe-1.1.2"
             ];
@@ -33682,15 +34441,15 @@ in
             dependencies = [
               (sources."async-2.1.2" // {
                 dependencies = [
-                  sources."lodash-4.16.6"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
           })
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -33790,7 +34549,7 @@ in
           sources."throttleit-1.0.0"
         ];
       })
-      (sources."which-1.2.11" // {
+      (sources."which-1.2.12" // {
         dependencies = [
           sources."isexe-1.1.2"
         ];
@@ -33959,9 +34718,9 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
         ];
@@ -33988,7 +34747,7 @@ in
           })
           (sources."openid-2.0.6" // {
             dependencies = [
-              (sources."request-2.78.0" // {
+              (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
                   sources."aws4-1.5.0"
@@ -34000,7 +34759,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.1.1" // {
+                  (sources."form-data-2.1.2" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -34084,12 +34843,11 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.12" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.24.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
-                  sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
                   sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
@@ -34099,6 +34857,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
+                  sources."uuid-3.0.0"
                 ];
               })
             ];
@@ -34108,7 +34867,7 @@ in
               sources."sax-1.2.1"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
-                  sources."lodash-4.16.6"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
@@ -34160,9 +34919,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -34244,12 +35003,12 @@ in
               })
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -34290,12 +35049,12 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -34306,9 +35065,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -34317,7 +35076,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -34334,7 +35093,7 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      (sources."js-yaml-3.6.1" // {
+      (sources."js-yaml-3.7.0" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
@@ -34344,13 +35103,13 @@ in
           sources."esprima-2.7.3"
         ];
       })
-      (sources."cookies-0.6.1" // {
+      (sources."cookies-0.6.2" // {
         dependencies = [
           sources."depd-1.1.0"
           sources."keygrip-1.0.1"
         ];
       })
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -34362,7 +35121,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.1" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -34441,12 +35200,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.24.0"
+              sources."mime-db-1.25.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -34456,6 +35214,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
         ];
       })
       sources."async-0.9.2"
@@ -34467,9 +35226,9 @@ in
           sources."sigmund-1.0.1"
         ];
       })
-      (sources."bunyan-1.8.4" // {
+      (sources."bunyan-1.8.5" // {
         dependencies = [
-          (sources."dtrace-provider-0.7.1" // {
+          (sources."dtrace-provider-0.8.0" // {
             dependencies = [
               sources."nan-2.4.0"
             ];
@@ -34510,7 +35269,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.15.2"
+          sources."moment-2.16.0"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -34566,7 +35325,7 @@ in
                   })
                   sources."entities-1.1.1"
                   sources."inherits-2.0.3"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -34597,11 +35356,11 @@ in
         ];
       })
       sources."sinopia-htpasswd-0.4.5"
-      (sources."http-errors-1.5.0" // {
+      (sources."http-errors-1.5.1" // {
         dependencies = [
-          sources."inherits-2.0.1"
-          sources."setprototypeof-1.0.1"
-          sources."statuses-1.3.0"
+          sources."inherits-2.0.3"
+          sources."setprototypeof-1.0.2"
+          sources."statuses-1.3.1"
         ];
       })
       (sources."readable-stream-1.1.14" // {
@@ -34667,12 +35426,12 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -34752,7 +35511,7 @@ in
               })
             ];
           })
-          (sources."verror-1.8.1" // {
+          (sources."verror-1.9.0" // {
             dependencies = [
               sources."assert-plus-1.0.0"
               sources."core-util-is-1.0.2"
@@ -34838,12 +35597,12 @@ in
           (sources."sshpk-agent-1.2.1" // {
             dependencies = [
               sources."assert-plus-0.1.5"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -34882,7 +35641,7 @@ in
       (sources."cmdln-3.2.1" // {
         dependencies = [
           sources."extsprintf-1.3.0"
-          (sources."verror-1.8.1" // {
+          (sources."verror-1.9.0" // {
             dependencies = [
               sources."assert-plus-1.0.0"
               sources."core-util-is-1.0.2"
@@ -34923,9 +35682,9 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       sources."sax-0.5.8"
@@ -35040,13 +35799,17 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.10";
+    version = "5.0.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz";
-      sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
+      sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
     };
     dependencies = [
-      sources."async-1.4.2"
+      (sources."async-2.1.2" // {
+        dependencies = [
+          sources."lodash-4.17.2"
+        ];
+      })
       sources."colors-1.1.2"
       (sources."fields-0.1.24" // {
         dependencies = [
@@ -35055,7 +35818,7 @@ in
         ];
       })
       sources."humanize-0.0.9"
-      (sources."longjohn-0.2.9" // {
+      (sources."longjohn-0.2.11" // {
         dependencies = [
           (sources."source-map-support-0.3.2" // {
             dependencies = [
@@ -35068,20 +35831,23 @@ in
           })
         ];
       })
-      sources."moment-2.10.6"
-      (sources."node-appc-0.2.31" // {
+      sources."moment-2.16.0"
+      (sources."node-appc-0.2.39" // {
         dependencies = [
           sources."adm-zip-0.4.7"
-          sources."diff-2.1.0"
-          sources."node-uuid-1.4.3"
+          sources."async-1.5.2"
+          sources."diff-2.2.1"
+          sources."node-uuid-1.4.7"
           (sources."optimist-0.6.1" // {
             dependencies = [
               sources."wordwrap-0.0.3"
               sources."minimist-0.0.10"
             ];
           })
-          (sources."request-2.61.0" // {
+          (sources."request-2.69.0" // {
             dependencies = [
+              sources."aws-sign2-0.6.0"
+              sources."aws4-1.5.0"
               (sources."bl-1.0.3" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -35097,57 +35863,24 @@ in
                 ];
               })
               sources."caseless-0.11.0"
+              (sources."combined-stream-1.0.5" // {
+                dependencies = [
+                  sources."delayed-stream-1.0.0"
+                ];
+              })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
                   (sources."async-2.1.2" // {
                     dependencies = [
-                      sources."lodash-4.16.6"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
               })
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
-                dependencies = [
-                  sources."mime-db-1.24.0"
-                ];
-              })
-              sources."qs-4.0.0"
-              sources."tunnel-agent-0.4.3"
-              (sources."tough-cookie-2.3.2" // {
-                dependencies = [
-                  sources."punycode-1.4.1"
-                ];
-              })
-              (sources."http-signature-0.11.0" // {
-                dependencies = [
-                  sources."assert-plus-0.1.5"
-                  sources."asn1-0.1.11"
-                  sources."ctype-0.5.3"
-                ];
-              })
-              sources."oauth-sign-0.8.2"
-              (sources."hawk-3.1.3" // {
-                dependencies = [
-                  sources."hoek-2.16.3"
-                  sources."boom-2.10.1"
-                  sources."cryptiles-2.0.5"
-                  sources."sntp-1.0.9"
-                ];
-              })
-              sources."aws-sign2-0.5.0"
-              sources."stringstream-0.0.5"
-              (sources."combined-stream-1.0.5" // {
-                dependencies = [
-                  sources."delayed-stream-1.0.0"
-                ];
-              })
-              sources."isstream-0.1.2"
-              (sources."har-validator-1.8.0" // {
+              (sources."har-validator-2.0.6" // {
                 dependencies = [
-                  sources."bluebird-2.11.0"
                   (sources."chalk-1.1.3" // {
                     dependencies = [
                       sources."ansi-styles-2.2.1"
@@ -35182,102 +35915,135 @@ in
                       sources."xtend-4.0.1"
                     ];
                   })
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."hawk-3.1.3" // {
+                dependencies = [
+                  sources."hoek-2.16.3"
+                  sources."boom-2.10.1"
+                  sources."cryptiles-2.0.5"
+                  sources."sntp-1.0.9"
+                ];
+              })
+              (sources."http-signature-1.1.1" // {
+                dependencies = [
+                  sources."assert-plus-0.2.0"
+                  (sources."jsprim-1.3.1" // {
+                    dependencies = [
+                      sources."extsprintf-1.0.2"
+                      sources."json-schema-0.2.3"
+                      sources."verror-1.3.6"
+                    ];
+                  })
+                  (sources."sshpk-1.10.1" // {
+                    dependencies = [
+                      sources."asn1-0.2.3"
+                      sources."assert-plus-1.0.0"
+                      sources."dashdash-1.14.0"
+                      sources."getpass-0.1.6"
+                      sources."jsbn-0.1.0"
+                      sources."tweetnacl-0.14.3"
+                      sources."jodid25519-1.0.2"
+                      sources."ecc-jsbn-0.1.1"
+                      sources."bcrypt-pbkdf-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."is-typedarray-1.0.0"
+              sources."isstream-0.1.2"
+              sources."json-stringify-safe-5.0.1"
+              (sources."mime-types-2.1.13" // {
+                dependencies = [
+                  sources."mime-db-1.25.0"
                 ];
               })
+              sources."oauth-sign-0.8.2"
+              sources."qs-6.0.2"
+              sources."stringstream-0.0.5"
+              sources."tough-cookie-2.2.2"
+              sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."semver-5.0.1"
-          (sources."uglify-js-2.4.24" // {
+          sources."semver-5.1.0"
+          sources."wrench-1.5.8"
+          (sources."uglify-js-2.6.1" // {
             dependencies = [
               sources."async-0.2.10"
-              (sources."source-map-0.1.34" // {
-                dependencies = [
-                  sources."amdefine-1.0.1"
-                ];
-              })
+              sources."source-map-0.5.6"
               sources."uglify-to-browserify-1.0.2"
-              (sources."yargs-3.5.4" // {
+              (sources."yargs-3.10.0" // {
                 dependencies = [
                   sources."camelcase-1.2.1"
+                  (sources."cliui-2.1.0" // {
+                    dependencies = [
+                      (sources."center-align-0.1.3" // {
+                        dependencies = [
+                          (sources."align-text-0.1.4" // {
+                            dependencies = [
+                              (sources."kind-of-3.0.4" // {
+                                dependencies = [
+                                  sources."is-buffer-1.1.4"
+                                ];
+                              })
+                              sources."longest-1.0.1"
+                              sources."repeat-string-1.6.1"
+                            ];
+                          })
+                          sources."lazy-cache-1.0.4"
+                        ];
+                      })
+                      (sources."right-align-0.1.3" // {
+                        dependencies = [
+                          (sources."align-text-0.1.4" // {
+                            dependencies = [
+                              (sources."kind-of-3.0.4" // {
+                                dependencies = [
+                                  sources."is-buffer-1.1.4"
+                                ];
+                              })
+                              sources."longest-1.0.1"
+                              sources."repeat-string-1.6.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."wordwrap-0.0.2"
+                    ];
+                  })
                   sources."decamelize-1.2.0"
                   sources."window-size-0.1.0"
-                  sources."wordwrap-0.0.2"
                 ];
               })
             ];
           })
-          sources."xmldom-0.1.19"
+          sources."xmldom-0.1.22"
         ];
       })
-      (sources."request-2.62.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
-          (sources."bl-1.0.3" // {
+          sources."aws-sign2-0.6.0"
+          sources."aws4-1.5.0"
+          sources."caseless-0.11.0"
+          (sources."combined-stream-1.0.5" // {
             dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
+              sources."delayed-stream-1.0.0"
             ];
           })
-          sources."caseless-0.11.0"
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-1.0.1" // {
-            dependencies = [
-              (sources."async-2.1.2" // {
-                dependencies = [
-                  sources."lodash-4.16.6"
-                ];
-              })
-            ];
-          })
-          sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.12" // {
-            dependencies = [
-              sources."mime-db-1.24.0"
-            ];
-          })
-          sources."node-uuid-1.4.7"
-          sources."qs-5.1.0"
-          sources."tunnel-agent-0.4.3"
-          (sources."tough-cookie-2.3.2" // {
+          (sources."form-data-2.1.2" // {
             dependencies = [
-              sources."punycode-1.4.1"
-            ];
-          })
-          (sources."http-signature-0.11.0" // {
-            dependencies = [
-              sources."assert-plus-0.1.5"
-              sources."asn1-0.1.11"
-              sources."ctype-0.5.3"
-            ];
-          })
-          sources."oauth-sign-0.8.2"
-          (sources."hawk-3.1.3" // {
-            dependencies = [
-              sources."hoek-2.16.3"
-              sources."boom-2.10.1"
-              sources."cryptiles-2.0.5"
-              sources."sntp-1.0.9"
-            ];
-          })
-          sources."aws-sign2-0.5.0"
-          sources."stringstream-0.0.5"
-          (sources."combined-stream-1.0.5" // {
-            dependencies = [
-              sources."delayed-stream-1.0.0"
+              sources."asynckit-0.4.0"
             ];
           })
-          sources."isstream-0.1.2"
-          (sources."har-validator-1.8.0" // {
+          (sources."har-validator-2.0.6" // {
             dependencies = [
-              sources."bluebird-2.11.0"
               (sources."chalk-1.1.3" // {
                 dependencies = [
                   sources."ansi-styles-2.2.1"
@@ -35312,11 +36078,67 @@ in
                   sources."xtend-4.0.1"
                 ];
               })
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
             ];
           })
+          (sources."hawk-3.1.3" // {
+            dependencies = [
+              sources."hoek-2.16.3"
+              sources."boom-2.10.1"
+              sources."cryptiles-2.0.5"
+              sources."sntp-1.0.9"
+            ];
+          })
+          (sources."http-signature-1.1.1" // {
+            dependencies = [
+              sources."assert-plus-0.2.0"
+              (sources."jsprim-1.3.1" // {
+                dependencies = [
+                  sources."extsprintf-1.0.2"
+                  sources."json-schema-0.2.3"
+                  sources."verror-1.3.6"
+                ];
+              })
+              (sources."sshpk-1.10.1" // {
+                dependencies = [
+                  sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
+                  sources."dashdash-1.14.0"
+                  sources."getpass-0.1.6"
+                  sources."jsbn-0.1.0"
+                  sources."tweetnacl-0.14.3"
+                  sources."jodid25519-1.0.2"
+                  sources."ecc-jsbn-0.1.1"
+                  sources."bcrypt-pbkdf-1.0.0"
+                ];
+              })
+            ];
+          })
+          sources."is-typedarray-1.0.0"
+          sources."isstream-0.1.2"
+          sources."json-stringify-safe-5.0.1"
+          (sources."mime-types-2.1.13" // {
+            dependencies = [
+              sources."mime-db-1.25.0"
+            ];
+          })
+          sources."node-uuid-1.4.7"
+          sources."oauth-sign-0.8.2"
+          sources."qs-6.3.0"
+          sources."stringstream-0.0.5"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
+          sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."semver-5.0.3"
+      sources."semver-5.3.0"
       sources."sprintf-0.1.5"
       (sources."temp-0.8.3" // {
         dependencies = [
@@ -35324,7 +36146,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-1.0.2" // {
+      (sources."winston-1.1.2" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
@@ -35335,7 +36157,7 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      sources."wrench-1.5.8"
+      sources."wrench-1.5.9"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -35348,10 +36170,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.6";
+    version = "2.0.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
-      sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35447,11 +36269,11 @@ in
             ];
           })
           sources."depd-1.1.0"
-          (sources."http-errors-1.5.0" // {
+          (sources."http-errors-1.5.1" // {
             dependencies = [
-              sources."inherits-2.0.1"
-              sources."setprototypeof-1.0.1"
-              sources."statuses-1.3.0"
+              sources."inherits-2.0.3"
+              sources."setprototypeof-1.0.2"
+              sources."statuses-1.3.1"
             ];
           })
           sources."iconv-lite-0.4.13"
@@ -35466,12 +36288,12 @@ in
               sources."unpipe-1.0.0"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -35481,7 +36303,7 @@ in
       (sources."color-0.11.4" // {
         dependencies = [
           sources."clone-1.0.2"
-          (sources."color-convert-1.6.0" // {
+          (sources."color-convert-1.8.2" // {
             dependencies = [
               sources."color-name-1.1.1"
             ];
@@ -35509,9 +36331,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -35566,12 +36388,12 @@ in
               sources."statuses-1.2.1"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -35719,8 +36541,8 @@ in
           (sources."extract-opts-3.3.1" // {
             dependencies = [
               sources."eachr-3.2.0"
-              sources."editions-1.3.1"
-              sources."typechecker-4.3.0"
+              sources."editions-1.3.3"
+              sources."typechecker-4.4.0"
             ];
           })
         ];
@@ -35731,7 +36553,7 @@ in
           sources."underscore-1.5.2"
         ];
       })
-      sources."knockout-3.4.0"
+      sources."knockout-3.4.1"
       sources."lodash-4.12.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -35891,9 +36713,9 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.2.0" // {
+                      (sources."debug-2.3.3" // {
                         dependencies = [
-                          sources."ms-0.7.1"
+                          sources."ms-0.7.2"
                         ];
                       })
                       (sources."es6-symbol-3.1.0" // {
@@ -36095,9 +36917,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -36132,7 +36954,7 @@ in
               sources."builtins-0.0.7"
             ];
           })
-          (sources."which-1.2.11" // {
+          (sources."which-1.2.12" // {
             dependencies = [
               sources."isexe-1.1.2"
             ];
@@ -36210,7 +37032,7 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.78.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
@@ -36222,7 +37044,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -36306,12 +37128,11 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
@@ -36321,6 +37142,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
           sources."retry-0.8.0"
@@ -36330,12 +37152,12 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
                       sources."string_decoder-0.10.31"
                       sources."util-deprecate-1.0.2"
@@ -36615,9 +37437,9 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."reduce-component-1.0.1"
@@ -36974,15 +37796,15 @@ in
                 dependencies = [
                   (sources."async-2.1.2" // {
                     dependencies = [
-                      sources."lodash-4.16.6"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
               })
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.24.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -37082,7 +37904,7 @@ in
               sources."throttleit-1.0.0"
             ];
           })
-          (sources."which-1.2.11" // {
+          (sources."which-1.2.12" // {
             dependencies = [
               sources."isexe-1.1.2"
             ];
@@ -37142,12 +37964,12 @@ in
               sources."prr-0.0.0"
             ];
           })
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -37401,7 +38223,7 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.1.5" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -37424,12 +38246,12 @@ in
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.0" // {
+                      (sources."npmlog-4.0.1" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.1.5" // {
+                              (sources."readable-stream-2.2.2" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -37442,7 +38264,7 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.6.0" // {
+                          (sources."gauge-2.7.1" // {
                             dependencies = [
                               sources."aproba-1.0.4"
                               sources."has-color-0.1.7"
@@ -37478,7 +38300,7 @@ in
                           sources."strip-json-comments-1.0.4"
                         ];
                       })
-                      (sources."request-2.78.0" // {
+                      (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
                           sources."aws4-1.5.0"
@@ -37490,7 +38312,7 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.1.1" // {
+                          (sources."form-data-2.1.2" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
@@ -37574,12 +38396,11 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.12" // {
+                          (sources."mime-types-2.1.13" // {
                             dependencies = [
-                              sources."mime-db-1.24.0"
+                              sources."mime-db-1.25.0"
                             ];
                           })
-                          sources."node-uuid-1.4.7"
                           sources."oauth-sign-0.8.2"
                           sources."qs-6.3.0"
                           sources."stringstream-0.0.5"
@@ -37589,6 +38410,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
+                          sources."uuid-3.0.0"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index b2202168ef67..6ece606398ac 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -229,13 +229,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "amdefine-1.0.0" = {
+    "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
-        sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
       };
     };
     "wordwrap-0.0.3" = {
@@ -310,13 +310,13 @@ let
         sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
       };
     };
-    "which-1.2.11" = {
+    "which-1.2.12" = {
       name = "which";
       packageName = "which";
-      version = "1.2.11";
+      version = "1.2.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz";
-        sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b";
+        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
+        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
     "os-homedir-1.0.2" = {
@@ -418,13 +418,13 @@ let
         sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
       };
     };
-    "azure-arm-commerce-0.1.1" = {
+    "azure-arm-commerce-0.2.0" = {
       name = "azure-arm-commerce";
       packageName = "azure-arm-commerce";
-      version = "0.1.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz";
-        sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59";
+        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
+        sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
     "azure-arm-compute-0.19.0" = {
@@ -436,13 +436,13 @@ let
         sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
       };
     };
-    "azure-arm-hdinsight-0.2.0" = {
+    "azure-arm-hdinsight-0.2.2" = {
       name = "azure-arm-hdinsight";
       packageName = "azure-arm-hdinsight";
-      version = "0.2.0";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz";
-        sha1 = "13d2cff9110485970bf063c7411eefe148e3790f";
+        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
       };
     };
     "azure-arm-hdinsight-jobs-0.1.0" = {
@@ -463,13 +463,13 @@ let
         sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
       };
     };
-    "azure-arm-iothub-0.1.1" = {
+    "azure-arm-iothub-0.1.4" = {
       name = "azure-arm-iothub";
       packageName = "azure-arm-iothub";
-      version = "0.1.1";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz";
-        sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535";
+        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
+        sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
       };
     };
     "azure-arm-servermanagement-0.1.2" = {
@@ -868,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.15.2" = {
+    "moment-2.16.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.15.2";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
-        sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
+        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
       };
     };
     "ms-rest-1.15.2" = {
@@ -1102,13 +1102,13 @@ let
         sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
       };
     };
-    "jws-3.1.3" = {
+    "jws-3.1.4" = {
       name = "jws";
       packageName = "jws";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz";
-        sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c";
+        url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
+        sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
       };
     };
     "node-uuid-1.4.7" = {
@@ -1138,184 +1138,31 @@ let
         sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
       };
     };
-    "base64url-1.0.6" = {
+    "base64url-2.0.0" = {
       name = "base64url";
       packageName = "base64url";
-      version = "1.0.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz";
-        sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681";
+        url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
+        sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.3" = {
+    "jwa-1.1.4" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz";
-        sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d";
-      };
-    };
-    "concat-stream-1.4.10" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.4.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
-        sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
-      };
-    };
-    "meow-2.0.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
-        sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "readable-stream-1.1.14" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "camelcase-keys-1.0.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
-        sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
-      };
-    };
-    "indent-string-1.2.2" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
-        sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
-      };
-    };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
-      };
-    };
-    "object-assign-1.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
-        sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "map-obj-1.0.1" = {
-      name = "map-obj";
-      packageName = "map-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
-      };
-    };
-    "get-stdin-4.0.1" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-      };
-    };
-    "repeating-1.1.3" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
-        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
-      };
-    };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.0.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1462,6 +1309,24 @@ let
         sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
       };
     };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1480,6 +1345,15 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -1831,6 +1705,15 @@ let
         sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
       };
     };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
     "aws-sign2-0.6.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
@@ -1948,13 +1831,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.12" = {
+    "mime-types-2.1.13" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.12";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz";
-        sha1 = "152ba256777020dd4663f54c2e7bc26381e71729";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -2020,13 +1903,13 @@ let
         sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "lodash-4.16.4" = {
+    "lodash-4.17.2" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.16.4";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz";
-        sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
       };
     };
     "chalk-1.1.3" = {
@@ -2353,13 +2236,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.24.0" = {
+    "mime-db-1.25.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.24.0";
+      version = "1.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz";
-        sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
       };
     };
     "punycode-1.4.1" = {
@@ -2416,6 +2299,15 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
     "http-response-object-1.1.0" = {
       name = "http-response-object";
       packageName = "http-response-object";
@@ -2434,6 +2326,15 @@ let
         sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81";
       };
     };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2497,13 +2398,13 @@ let
         sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
       };
     };
-    "bower-1.7.9" = {
+    "bower-1.8.0" = {
       name = "bower";
       packageName = "bower";
-      version = "1.7.9";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
-        sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+        sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
       };
     };
     "bower-endpoint-parser-0.2.1" = {
@@ -2749,13 +2650,13 @@ let
         sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
       };
     };
-    "statuses-1.3.0" = {
+    "statuses-1.3.1" = {
       name = "statuses";
       packageName = "statuses";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
-        sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
       };
     };
     "timed-out-2.0.0" = {
@@ -2776,13 +2677,13 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.1.5" = {
+    "readable-stream-2.2.2" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.1.5";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
       };
     };
     "stream-shift-1.0.0" = {
@@ -2839,6 +2740,24 @@ let
         sha1 = "5b46f80147edee578870f086d04821cf998e551f";
       };
     };
+    "map-obj-1.0.1" = {
+      name = "map-obj";
+      packageName = "map-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
     "normalize-package-data-2.3.5" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
@@ -3028,13 +2947,13 @@ let
         sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "graceful-fs-4.1.9" = {
+    "graceful-fs-4.1.10" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.9";
+      version = "4.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz";
-        sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz";
+        sha1 = "f2d720c22092f743228775c75e3612632501f131";
       };
     };
     "parse-json-2.2.0" = {
@@ -3118,6 +3037,33 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "get-stdin-4.0.1" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+      };
+    };
     "sort-keys-1.1.2" = {
       name = "sort-keys";
       packageName = "sort-keys";
@@ -3172,22 +3118,22 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.2.0" = {
+    "debug-2.3.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.2.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
-    "ms-0.7.1" = {
+    "ms-0.7.2" = {
       name = "ms";
       packageName = "ms";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
     "rimraf-2.2.8" = {
@@ -3262,15 +3208,6 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
-    "concat-stream-1.5.2" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3487,13 +3424,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.4.1" = {
+    "stream-http-2.5.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.4.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
-        sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
       };
     };
     "subarg-1.0.0" = {
@@ -3865,13 +3802,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.8.1" = {
+    "asn1.js-4.9.0" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.8.1";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz";
-        sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3883,13 +3820,13 @@ let
         sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
       };
     };
-    "sha.js-2.4.5" = {
+    "sha.js-2.4.8" = {
       name = "sha.js";
       packageName = "sha.js";
-      version = "2.4.5";
+      version = "2.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
-        sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
+        sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
       };
     };
     "miller-rabin-4.0.0" = {
@@ -4468,6 +4405,15 @@ let
         sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
       };
     };
+    "object-assign-1.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+        sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+      };
+    };
     "airplay-js-0.2.16" = {
       name = "airplay-js";
       packageName = "airplay-js";
@@ -4576,13 +4522,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.0" = {
+    "mdns-js-0.5.1" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz";
-        sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
       };
     };
     "plist-2.0.1" = {
@@ -4594,13 +4540,13 @@ let
         sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b";
       };
     };
-    "mdns-js-packet-0.2.0" = {
-      name = "mdns-js-packet";
-      packageName = "mdns-js-packet";
-      version = "0.2.0";
+    "dns-js-0.2.1" = {
+      name = "dns-js";
+      packageName = "dns-js";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz";
-        sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616";
+        url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz";
+        sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673";
       };
     };
     "semver-5.1.1" = {
@@ -4720,13 +4666,13 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
-    "magnet-uri-5.1.4" = {
+    "magnet-uri-5.1.5" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz";
-        sha1 = "225db1f8670a944db87a5fbe27e2d90350513403";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz";
+        sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
       };
     };
     "parse-torrent-file-4.0.0" = {
@@ -4981,13 +4927,13 @@ let
         sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
       };
     };
-    "ip-1.1.3" = {
+    "ip-1.1.4" = {
       name = "ip";
       packageName = "ip";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz";
-        sha1 = "12b16294a38925486d618a1103506e4eb4f8b296";
+        url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz";
+        sha1 = "de8247ffef940451832550fba284945e6e039bfb";
       };
     };
     "magnet-uri-4.2.3" = {
@@ -5071,6 +5017,15 @@ let
         sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
       };
     };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
     "bncode-0.2.3" = {
       name = "bncode";
       packageName = "bncode";
@@ -5557,13 +5512,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.0.1" = {
+    "exit-on-epipe-0.1.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.0.1";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz";
-        sha1 = "ea41650007098c8444519a5d48958170c4ad929b";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
+        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
       };
     };
     "sax-1.2.1" = {
@@ -5719,13 +5674,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.16" = {
+    "big-integer-1.6.17" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.16";
+      version = "1.6.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
-        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz";
+        sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51";
       };
     };
     "sax-0.3.5" = {
@@ -6052,13 +6007,22 @@ let
         sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
       };
     };
-    "compressible-2.0.8" = {
+    "compressible-2.0.9" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.8";
+      version = "2.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
+        sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
+      };
+    };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz";
-        sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503";
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
       };
     };
     "on-headers-1.0.1" = {
@@ -6088,6 +6052,15 @@ let
         sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
       };
     };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "array-flatten-1.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
@@ -6268,13 +6241,13 @@ let
         sha1 = "d6cce7693505f733c759de57befc1af76c0f0805";
       };
     };
-    "type-is-1.6.13" = {
+    "type-is-1.6.14" = {
       name = "type-is";
       packageName = "type-is";
-      version = "1.6.13";
+      version = "1.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
-        sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
+        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
       };
     };
     "utils-merge-1.0.0" = {
@@ -6331,22 +6304,22 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.5.0" = {
+    "http-errors-1.5.1" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
-        sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
       };
     };
-    "setprototypeof-1.0.1" = {
+    "setprototypeof-1.0.2" = {
       name = "setprototypeof";
       packageName = "setprototypeof";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
-        sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
       };
     };
     "media-typer-0.3.0" = {
@@ -6727,6 +6700,15 @@ let
         sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
       };
     };
+    "readable-stream-2.1.5" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
+        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+      };
+    };
     "realize-package-specifier-3.0.3" = {
       name = "realize-package-specifier";
       packageName = "realize-package-specifier";
@@ -6952,22 +6934,22 @@ let
         sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
       };
     };
-    "request-2.76.0" = {
+    "request-2.79.0" = {
       name = "request";
       packageName = "request";
-      version = "2.76.0";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz";
-        sha1 = "be44505afef70360a0436955106be3945d95560e";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
-    "form-data-2.1.1" = {
+    "form-data-2.1.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
-        sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
     "qs-6.3.0" = {
@@ -6979,6 +6961,15 @@ let
         sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7411,13 +7402,13 @@ let
         sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
       };
     };
-    "code-point-at-1.0.1" = {
+    "code-point-at-1.1.0" = {
       name = "code-point-at";
       packageName = "code-point-at";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz";
-        sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb";
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -7483,6 +7474,15 @@ let
         sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
       };
     };
+    "repeating-1.1.3" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+      };
+    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -8126,13 +8126,13 @@ let
         sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
       };
     };
-    "verror-1.8.1" = {
+    "verror-1.9.0" = {
       name = "verror";
       packageName = "verror";
-      version = "1.8.1";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz";
-        sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029";
+        url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz";
+        sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee";
       };
     };
     "extsprintf-1.3.0" = {
@@ -8225,13 +8225,13 @@ let
         sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
       };
     };
-    "basic-auth-1.0.4" = {
+    "basic-auth-1.1.0" = {
       name = "basic-auth";
       packageName = "basic-auth";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
-        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
+        sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
     "cors-2.8.1" = {
@@ -8477,13 +8477,13 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
-    "ltgt-2.1.2" = {
+    "ltgt-2.1.3" = {
       name = "ltgt";
       packageName = "ltgt";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
-        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz";
+        sha1 = "10851a06d9964b971178441c23c9e52698eece34";
       };
     };
     "pull-level-2.0.3" = {
@@ -8495,13 +8495,13 @@ let
         sha1 = "9500635e257945d6feede185f5d7a24773455b17";
       };
     };
-    "pull-stream-3.4.5" = {
+    "pull-stream-3.5.0" = {
       name = "pull-stream";
       packageName = "pull-stream";
-      version = "3.4.5";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz";
-        sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72";
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+        sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
       };
     };
     "typewiselite-1.0.0" = {
@@ -8729,13 +8729,13 @@ let
         sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
       };
     };
-    "got-6.5.0" = {
+    "got-6.6.3" = {
       name = "got";
       packageName = "got";
-      version = "6.5.0";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz";
-        sha1 = "67dcc727db871c7b250320860180e24d2db18a04";
+        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8810,6 +8810,15 @@ let
         sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
       };
     };
+    "timed-out-3.0.0" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
+        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+      };
+    };
     "url-parse-lax-1.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -8891,13 +8900,13 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.12.0" = {
+    "globals-9.14.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.12.0";
+      version = "9.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
-        sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
+        url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
+        sha1 = "8859936af0038741263053b39d0e76ca241e4034";
       };
     };
     "ignore-3.2.0" = {
@@ -8927,13 +8936,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.6.1" = {
+    "js-yaml-3.7.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.6.1";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -8981,13 +8990,13 @@ let
         sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
       };
     };
-    "require-uncached-1.0.2" = {
+    "require-uncached-1.0.3" = {
       name = "require-uncached";
       packageName = "require-uncached";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz";
-        sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
+        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
+        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
       };
     };
     "strip-bom-3.0.0" = {
@@ -9305,13 +9314,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.8.2" = {
+    "ajv-4.9.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.8.2";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
-        sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
       };
     };
     "ajv-keywords-1.1.1" = {
@@ -9404,13 +9413,13 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
-    "forever-monitor-1.6.0" = {
+    "forever-monitor-1.7.1" = {
       name = "forever-monitor";
       packageName = "forever-monitor";
-      version = "1.6.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz";
-        sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40";
+        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz";
+        sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8";
       };
     };
     "nconf-0.6.9" = {
@@ -9512,15 +9521,6 @@ let
         sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2";
       };
     };
-    "minimatch-2.0.10" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "2.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
-        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
-      };
-    };
     "ps-tree-0.0.3" = {
       name = "ps-tree";
       packageName = "ps-tree";
@@ -9584,13 +9584,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.14" = {
+    "fsevents-1.0.15" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.14";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz";
-        sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
+        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
       };
     };
     "micromatch-2.3.11" = {
@@ -9881,13 +9881,13 @@ let
         sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
-    "npmlog-4.0.0" = {
+    "npmlog-4.0.1" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz";
-        sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9908,13 +9908,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.6.0" = {
+    "gauge-2.7.1" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.6.0";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
-        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10116,13 +10116,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.20" = {
+    "clean-css-3.4.21" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.20";
+      version = "3.4.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz";
-        sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
       };
     };
     "commander-2.6.0" = {
@@ -10296,6 +10296,15 @@ let
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
     "cliui-2.1.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -10413,22 +10422,22 @@ let
         sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385";
       };
     };
-    "orchestrator-0.3.7" = {
+    "orchestrator-0.3.8" = {
       name = "orchestrator";
       packageName = "orchestrator";
-      version = "0.3.7";
+      version = "0.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
-        sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+        url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz";
+        sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e";
       };
     };
-    "pretty-hrtime-1.0.2" = {
+    "pretty-hrtime-1.0.3" = {
       name = "pretty-hrtime";
       packageName = "pretty-hrtime";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz";
-        sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8";
+        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+        sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
       };
     };
     "tildify-1.2.0" = {
@@ -10467,13 +10476,13 @@ let
         sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
       };
     };
-    "beeper-1.1.0" = {
+    "beeper-1.1.1" = {
       name = "beeper";
       packageName = "beeper";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz";
-        sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c";
+        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
+        sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
     "dateformat-1.0.12" = {
@@ -10980,6 +10989,15 @@ let
         sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
       };
     };
+    "minimatch-2.0.10" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+      };
+    };
     "ordered-read-streams-0.1.0" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -11277,13 +11295,13 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
-    "handlebars-4.0.5" = {
+    "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.0.5";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz";
-        sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz";
+        sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
       };
     };
     "supports-color-3.1.2" = {
@@ -11943,6 +11961,15 @@ let
         sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
       };
     };
+    "basic-auth-1.0.4" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+      };
+    };
     "connect-2.30.2" = {
       name = "connect";
       packageName = "connect";
@@ -12087,13 +12114,13 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.6" = {
+    "method-override-2.3.7" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
-        sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
       };
     };
     "morgan-1.6.1" = {
@@ -12132,22 +12159,22 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "response-time-2.3.1" = {
+    "response-time-2.3.2" = {
       name = "response-time";
       packageName = "response-time";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
-        sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
+        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
       };
     };
-    "serve-favicon-2.3.0" = {
+    "serve-favicon-2.3.2" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.3.0";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
-        sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
       };
     };
     "serve-index-1.7.3" = {
@@ -12186,22 +12213,13 @@ let
         sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
-    "csrf-3.0.3" = {
+    "csrf-3.0.4" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
-        sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
-      };
-    };
-    "base64-url-1.2.2" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.2.2";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
-        sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
+        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
     "rndm-1.2.0" = {
@@ -12222,13 +12240,13 @@ let
         sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "uid-safe-2.1.1" = {
+    "uid-safe-2.1.3" = {
       name = "uid-safe";
       packageName = "uid-safe";
-      version = "2.1.1";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
-        sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
+        sha1 = "077e264a00b3187936b270bb7376a26473631071";
       };
     };
     "random-bytes-1.0.0" = {
@@ -12771,6 +12789,15 @@ let
         sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
       };
     };
+    "gauge-2.6.0" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+      };
+    };
     "uid-number-0.0.5" = {
       name = "uid-number";
       packageName = "uid-number";
@@ -13302,49 +13329,49 @@ let
         sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
       };
     };
-    "node-red-node-feedparser-0.1.6" = {
+    "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
-        sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
+        sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.11" = {
+    "node-red-node-email-0.1.12" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.11";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz";
-        sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
       };
     };
-    "node-red-node-twitter-0.1.7" = {
+    "node-red-node-twitter-0.1.9" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.7";
+      version = "0.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz";
-        sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz";
+        sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217";
       };
     };
-    "node-red-node-rbe-0.1.5" = {
+    "node-red-node-rbe-0.1.6" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.5";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz";
-        sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz";
+        sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.0" = {
+    "node-red-node-serialport-0.4.1" = {
       name = "node-red-node-serialport";
       packageName = "node-red-node-serialport";
-      version = "0.4.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
-        sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
       };
     };
     "bcrypt-0.8.7" = {
@@ -13500,13 +13527,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.7" = {
+    "moment-timezone-0.5.9" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.7";
+      version = "0.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
-        sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
       };
     };
     "retry-0.6.1" = {
@@ -13518,13 +13545,13 @@ let
         sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "cookies-0.6.1" = {
+    "cookies-0.6.2" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz";
-        sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
+        sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
       };
     };
     "i18next-client-1.10.3" = {
@@ -13608,13 +13635,13 @@ let
         sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
       };
     };
-    "websocket-stream-3.3.0" = {
+    "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "3.3.0";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz";
-        sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
+        sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
       };
     };
     "leven-1.0.2" = {
@@ -13887,13 +13914,13 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "uue-3.0.0" = {
+    "uue-3.1.0" = {
       name = "uue";
       packageName = "uue";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz";
-        sha1 = "07af69344defa9851b7b845c1c18110b8264e51e";
+        url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
+        sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
       };
     };
     "utf7-1.0.2" = {
@@ -13914,13 +13941,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.3" = {
+    "serialport-4.0.6" = {
       name = "serialport";
       packageName = "serialport";
-      version = "4.0.3";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz";
-        sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
       };
     };
     "lie-3.1.0" = {
@@ -14193,13 +14220,13 @@ let
         sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
       };
     };
-    "buffer-crc32-0.2.5" = {
+    "buffer-crc32-0.2.6" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
-      version = "0.2.5";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
-        sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
+        sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
       };
     };
     "fresh-0.1.0" = {
@@ -14508,13 +14535,13 @@ let
         sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
       };
     };
-    "raw-socket-1.5.0" = {
+    "raw-socket-1.5.1" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz";
-        sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
+        sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
     "argparse-0.1.16" = {
@@ -14598,6 +14625,15 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14607,6 +14643,15 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
+    "npm-registry-client-7.3.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "7.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+      };
+    };
     "opener-1.4.2" = {
       name = "opener";
       packageName = "opener";
@@ -14634,13 +14679,22 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.75.0" = {
+    "request-2.78.0" = {
       name = "request";
       packageName = "request";
-      version = "2.75.0";
+      version = "2.78.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
+    "sorted-union-stream-2.1.3" = {
+      name = "sorted-union-stream";
+      packageName = "sorted-union-stream";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
+        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
     "unique-filename-1.1.0" = {
@@ -14688,13 +14742,40 @@ let
         sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
-    "form-data-2.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.0.0";
+    "flush-write-stream-1.0.2" = {
+      name = "flush-write-stream";
+      packageName = "flush-write-stream";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
+        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
+      };
+    };
+    "from2-2.3.0" = {
+      name = "from2";
+      packageName = "from2";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    };
+    "stream-each-1.2.0" = {
+      name = "stream-each";
+      packageName = "stream-each";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
+        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+      };
+    };
+    "stream-iterate-1.2.0" = {
+      name = "stream-iterate";
+      packageName = "stream-iterate";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
       };
     };
     "unique-slug-2.0.0" = {
@@ -14922,13 +15003,13 @@ let
         sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "npm-3.10.9" = {
+    "npm-3.10.10" = {
       name = "npm";
       packageName = "npm";
-      version = "3.10.9";
+      version = "3.10.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
-        sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+        url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+        sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
     "npmi-2.0.1" = {
@@ -14976,6 +15057,24 @@ let
         sha1 = "27c90519196dc15015be02a34ea52986feab8877";
       };
     };
+    "request-2.75.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.75.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+      };
+    };
+    "form-data-2.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+      };
+    };
     "boxen-0.6.0" = {
       name = "boxen";
       packageName = "boxen";
@@ -15075,13 +15174,13 @@ let
         sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
       };
     };
-    "got-5.6.0" = {
+    "got-5.7.1" = {
       name = "got";
       packageName = "got";
-      version = "5.6.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz";
-        sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf";
+        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
     "registry-auth-token-3.1.0" = {
@@ -15102,13 +15201,458 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "unzip-response-1.0.1" = {
+    "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
+        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+      };
+    };
+    "babybird-0.0.1" = {
+      name = "babybird";
+      packageName = "babybird";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
+        sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
+      };
+    };
+    "connect-busboy-0.0.2" = {
+      name = "connect-busboy";
+      packageName = "connect-busboy";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+        sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
+      };
+    };
+    "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+      name = "content-type";
+      packageName = "content-type";
       version = "1.0.1";
+      src = fetchgit {
+        url = "https://github.com/wikimedia/content-type.git";
+        rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "domino-1.0.27" = {
+      name = "domino";
+      packageName = "domino";
+      version = "1.0.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
+        sha1 = "26bc01f739707505c51456af7f59e3373369475d";
+      };
+    };
+    "express-handlebars-3.0.0" = {
+      name = "express-handlebars";
+      packageName = "express-handlebars";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz";
+        sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
+      };
+    };
+    "finalhandler-0.5.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+      };
+    };
+    "gelf-stream-0.2.4" = {
+      name = "gelf-stream";
+      packageName = "gelf-stream";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
+        sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
+      };
+    };
+    "mediawiki-title-0.5.6" = {
+      name = "mediawiki-title";
+      packageName = "mediawiki-title";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz";
+        sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24";
+      };
+    };
+    "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.6.1";
+      src = fetchgit {
+        url = "https://github.com/arlolra/negotiator.git";
+        rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+      };
+    };
+    "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
+      name = "pegjs";
+      packageName = "pegjs";
+      version = "0.8.0";
+      src = fetchgit {
+        url = "https://github.com/tstarling/pegjs.git";
+        rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584";
+        sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905";
+      };
+    };
+    "prfun-2.1.4" = {
+      name = "prfun";
+      packageName = "prfun";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz";
+        sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
+      };
+    };
+    "service-runner-2.1.11" = {
+      name = "service-runner";
+      packageName = "service-runner";
+      version = "2.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+      };
+    };
+    "simplediff-0.1.1" = {
+      name = "simplediff";
+      packageName = "simplediff";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+        sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+      };
+    };
+    "yargs-4.8.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "4.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+      };
+    };
+    "is-arguments-1.0.2" = {
+      name = "is-arguments";
+      packageName = "is-arguments";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz";
+        sha1 = "07e30ad79531844179b642d2d8399435182c8727";
+      };
+    };
+    "busboy-0.2.13" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+      };
+    };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
+    "gelfling-0.2.0" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+      };
+    };
+    "bunyan-1.8.5" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
+        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+      };
+    };
+    "bunyan-syslog-udp-0.1.0" = {
+      name = "bunyan-syslog-udp";
+      packageName = "bunyan-syslog-udp";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz";
-        sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412";
+        url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz";
+        sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c";
+      };
+    };
+    "gelf-stream-1.1.1" = {
+      name = "gelf-stream";
+      packageName = "gelf-stream";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+        sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+      };
+    };
+    "hot-shots-4.3.1" = {
+      name = "hot-shots";
+      packageName = "hot-shots";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz";
+        sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
+      };
+    };
+    "limitation-0.1.9" = {
+      name = "limitation";
+      packageName = "limitation";
+      version = "0.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
+        sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+      };
+    };
+    "yargs-5.0.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
+        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+      };
+    };
+    "dtrace-provider-0.8.0" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz";
+        sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
+      };
+    };
+    "mv-2.1.1" = {
+      name = "mv";
+      packageName = "mv";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
+        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
+      };
+    };
+    "safe-json-stringify-1.0.3" = {
+      name = "safe-json-stringify";
+      packageName = "safe-json-stringify";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
+        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+      };
+    };
+    "ncp-2.0.0" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
+      };
+    };
+    "rimraf-2.4.5" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+      };
+    };
+    "gelfling-0.3.1" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+        sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
+      };
+    };
+    "kad-git+https://github.com/gwicke/kad.git#master" = {
+      name = "kad";
+      packageName = "kad";
+      version = "1.3.6";
+      src = fetchgit {
+        url = "https://github.com/gwicke/kad.git";
+        rev = "f35971036f43814043245da82b12d035b7bbfd16";
+        sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35";
+      };
+    };
+    "clarinet-0.11.0" = {
+      name = "clarinet";
+      packageName = "clarinet";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+        sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
+      };
+    };
+    "kad-fs-0.0.4" = {
+      name = "kad-fs";
+      packageName = "kad-fs";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+        sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
+      };
+    };
+    "kad-localstorage-0.0.7" = {
+      name = "kad-localstorage";
+      packageName = "kad-localstorage";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+        sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
+      };
+    };
+    "kad-memstore-0.0.1" = {
+      name = "kad-memstore";
+      packageName = "kad-memstore";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+        sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
+      };
+    };
+    "merge-1.2.0" = {
+      name = "merge";
+      packageName = "merge";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz";
+        sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
+      };
+    };
+    "msgpack5-3.4.1" = {
+      name = "msgpack5";
+      packageName = "msgpack5";
+      version = "3.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz";
+        sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114";
+      };
+    };
+    "dom-storage-2.0.2" = {
+      name = "dom-storage";
+      packageName = "dom-storage";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz";
+        sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
+      };
+    };
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+      };
+    };
+    "window-size-0.2.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+      };
+    };
+    "yargs-parser-3.2.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
+        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
+    "yargs-parser-2.4.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
+        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
     "airplayer-2.0.0" = {
@@ -15129,13 +15673,13 @@ let
         sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
       };
     };
-    "inquirer-1.2.2" = {
+    "inquirer-1.2.3" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
-        sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
+        sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
       };
     };
     "network-address-1.1.0" = {
@@ -15309,13 +15853,13 @@ let
         sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
       };
     };
-    "dns-packet-1.1.0" = {
+    "dns-packet-1.1.1" = {
       name = "dns-packet";
       packageName = "dns-packet";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz";
-        sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
+        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz";
+        sha1 = "2369d45038af045f3898e6fa56862aed3f40296c";
       };
     };
     "external-editor-1.1.1" = {
@@ -15390,13 +15934,13 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-0.9.17" = {
+    "socket.io-1.6.0" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "0.9.17";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
-        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
       };
     };
     "torrent-stream-0.18.1" = {
@@ -15768,13 +16312,121 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "socket.io-client-0.9.16" = {
+    "engine.io-1.8.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.6.0" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "0.9.16";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "engine.io-parser-1.3.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+      };
+    };
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    };
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
-        sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "engine.io-client-1.8.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
       };
     };
     "bittorrent-dht-3.2.6" = {
@@ -16390,15 +17042,6 @@ let
         sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
       };
     };
-    "bunyan-1.8.4" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
-        sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
-      };
-    };
     "handlebars-2.0.0" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -16543,51 +17186,6 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "dtrace-provider-0.7.1" = {
-      name = "dtrace-provider";
-      packageName = "dtrace-provider";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
-        sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
-      };
-    };
-    "mv-2.1.1" = {
-      name = "mv";
-      packageName = "mv";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
-        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
-      };
-    };
-    "safe-json-stringify-1.0.3" = {
-      name = "safe-json-stringify";
-      packageName = "safe-json-stringify";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
-        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
-      };
-    };
-    "ncp-2.0.0" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
-        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
-      };
-    };
-    "rimraf-2.4.5" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.4.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
-        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
-      };
-    };
     "uglify-js-2.3.6" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -17002,6 +17600,15 @@ let
         sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
       };
     };
+    "js-yaml-3.6.1" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+        sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+      };
+    };
     "whet.extend-0.9.9" = {
       name = "whet.extend";
       packageName = "whet.extend";
@@ -17047,31 +17654,22 @@ let
         sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
       };
     };
-    "longjohn-0.2.9" = {
+    "longjohn-0.2.11" = {
       name = "longjohn";
       packageName = "longjohn";
-      version = "0.2.9";
+      version = "0.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
-        sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+        url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz";
+        sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
       };
     };
-    "node-appc-0.2.31" = {
+    "node-appc-0.2.39" = {
       name = "node-appc";
       packageName = "node-appc";
-      version = "0.2.31";
+      version = "0.2.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
-        sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
-      };
-    };
-    "request-2.62.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.62.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz";
-        sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz";
+        sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
     "sprintf-0.1.5" = {
@@ -17083,22 +17681,22 @@ let
         sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
       };
     };
-    "winston-1.0.2" = {
+    "winston-1.1.2" = {
       name = "winston";
       packageName = "winston";
-      version = "1.0.2";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
-        sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
+        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+        sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
-    "wrench-1.5.8" = {
+    "wrench-1.5.9" = {
       name = "wrench";
       packageName = "wrench";
-      version = "1.5.8";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
-        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
+        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
       };
     };
     "source-map-support-0.3.2" = {
@@ -17128,85 +17726,58 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "diff-2.1.0" = {
+    "diff-2.2.1" = {
       name = "diff";
       packageName = "diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
-        sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
-      };
-    };
-    "node-uuid-1.4.3" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.3";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-        sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz";
+        sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec";
       };
     };
-    "request-2.61.0" = {
+    "request-2.69.0" = {
       name = "request";
       packageName = "request";
-      version = "2.61.0";
+      version = "2.69.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz";
-        sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
+        url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
+        sha1 = "cf91d2e000752b1217155c005241911991a2346a";
       };
     };
-    "semver-5.0.1" = {
+    "semver-5.1.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
-        sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
-      };
-    };
-    "uglify-js-2.4.24" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.4.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
-        sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
-      };
-    };
-    "har-validator-1.8.0" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "1.8.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
-        sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+        sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
       };
     };
-    "bluebird-2.11.0" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "2.11.0";
+    "wrench-1.5.8" = {
+      name = "wrench";
+      packageName = "wrench";
+      version = "1.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
-        sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
       };
     };
-    "yargs-3.5.4" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.5.4";
+    "uglify-js-2.6.1" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
-        sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "qs-5.1.0" = {
+    "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
-      version = "5.1.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
-        sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
+        url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+        sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
     "bluebird-3.3.5" = {
@@ -17227,13 +17798,13 @@ let
         sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
       };
     };
-    "color-0.11.3" = {
+    "color-0.11.4" = {
       name = "color";
       packageName = "color";
-      version = "0.11.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz";
-        sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6";
+        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
       };
     };
     "crossroads-0.12.2" = {
@@ -17308,13 +17879,13 @@ let
         sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
       };
     };
-    "knockout-3.4.0" = {
+    "knockout-3.4.1" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz";
-        sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz";
+        sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
     "lodash-4.12.0" = {
@@ -17416,13 +17987,13 @@ let
         sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
       };
     };
-    "color-convert-1.5.0" = {
+    "color-convert-1.8.2" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.5.0";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz";
-        sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
+        sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
     "color-string-0.3.0" = {
@@ -17596,22 +18167,22 @@ let
         sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
       };
     };
-    "editions-1.3.1" = {
+    "editions-1.3.3" = {
       name = "editions";
       packageName = "editions";
-      version = "1.3.1";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
-        sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
+        sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
       };
     };
-    "typechecker-4.3.0" = {
+    "typechecker-4.4.0" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz";
-        sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
+        sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
       };
     };
     "underscore-1.5.2" = {
@@ -17785,24 +18356,6 @@ let
         sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "pkg-conf-1.1.3" = {
       name = "pkg-conf";
       packageName = "pkg-conf";
@@ -17812,15 +18365,6 @@ let
         sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
     "set-blocking-1.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -17830,24 +18374,6 @@ let
         sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
       };
     };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "symbol-0.2.3" = {
       name = "symbol";
       packageName = "symbol";
@@ -17884,6 +18410,15 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
+    "tmp-0.0.30" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz";
+        sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed";
+      };
+    };
     "follow-redirects-0.0.3" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -18149,7 +18684,7 @@ in
       sources."async-0.2.10"
       sources."optimist-0.3.7"
       sources."uglify-to-browserify-1.0.2"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
       sources."wordwrap-0.0.3"
       sources."array-unique-0.2.1"
       (sources."global-modules-0.2.3" // {
@@ -18165,7 +18700,7 @@ in
       })
       sources."ini-1.3.4"
       sources."osenv-0.1.3"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."isexe-1.1.2"
@@ -18184,10 +18719,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.6";
+    version = "0.10.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz";
-      sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
+      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18204,12 +18739,12 @@ in
       })
       sources."azure-arm-authorization-2.0.0"
       sources."azure-arm-cdn-0.2.1"
-      sources."azure-arm-commerce-0.1.1"
+      sources."azure-arm-commerce-0.2.0"
       sources."azure-arm-compute-0.19.0"
-      sources."azure-arm-hdinsight-0.2.0"
+      sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
-      sources."azure-arm-iothub-0.1.1"
+      sources."azure-arm-iothub-0.1.4"
       sources."azure-arm-servermanagement-0.1.2"
       sources."azure-arm-network-0.17.0"
       sources."azure-arm-powerbiembedded-0.1.0"
@@ -18250,7 +18785,6 @@ in
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
           sources."xml2js-0.2.7"
-          sources."isarray-1.0.0"
         ];
       })
       sources."azure-arm-batch-0.3.0"
@@ -18275,7 +18809,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.15.2"
+      sources."moment-2.16.0"
       sources."ms-rest-1.15.2"
       (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
@@ -18299,7 +18833,11 @@ in
           sources."colors-0.6.2"
         ];
       })
-      sources."readable-stream-1.0.34"
+      (sources."readable-stream-1.0.34" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
       (sources."request-2.74.0" // {
         dependencies = [
           sources."extend-3.0.0"
@@ -18331,32 +18869,12 @@ in
       sources."xmlbuilder-0.4.3"
       sources."read-1.0.7"
       sources."date-utils-1.2.21"
-      sources."jws-3.1.3"
+      sources."jws-3.1.4"
       sources."xmldom-0.1.22"
       sources."xpath.js-1.0.6"
-      sources."base64url-1.0.6"
-      sources."jwa-1.1.3"
-      (sources."concat-stream-1.4.10" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-        ];
-      })
-      sources."meow-2.0.0"
-      sources."inherits-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
-      sources."camelcase-keys-1.0.0"
-      sources."indent-string-1.2.2"
-      sources."minimist-1.2.0"
-      sources."object-assign-1.0.0"
-      sources."camelcase-1.2.1"
-      sources."map-obj-1.0.1"
-      sources."get-stdin-4.0.1"
-      sources."repeating-1.1.3"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
+      sources."base64url-2.0.0"
+      sources."jwa-1.1.4"
+      sources."safe-buffer-5.0.1"
       sources."buffer-equal-constant-time-1.0.1"
       sources."ecdsa-sig-formatter-1.0.7"
       sources."base64-url-1.3.3"
@@ -18368,7 +18886,11 @@ in
       sources."browserify-mime-1.2.9"
       sources."json-edm-parser-0.1.2"
       sources."jsonparse-1.2.0"
+      sources."core-util-is-1.0.2"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."stack-trace-0.0.9"
       sources."keypress-0.1.0"
@@ -18399,13 +18921,10 @@ in
       })
       sources."deep-equal-1.0.1"
       sources."i-0.3.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."rimraf-2.5.4"
+      sources."minimist-0.0.8"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -18423,7 +18942,6 @@ in
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
         ];
       })
       sources."caseless-0.11.0"
@@ -18446,14 +18964,14 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
@@ -18497,15 +19015,21 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
       sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
+      (sources."concat-stream-1.5.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
+      sources."typedarray-0.0.6"
       sources."http-basic-2.5.1"
       sources."promise-7.1.1"
       sources."asap-2.0.5"
@@ -18523,10 +19047,10 @@ in
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
-    version = "1.7.9";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
-      sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz";
+      sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -18546,13 +19070,13 @@ in
     };
     dependencies = [
       sources."argparse-1.0.4"
-      sources."bower-1.7.9"
+      sources."bower-1.8.0"
       sources."bower-endpoint-parser-0.2.1"
       sources."bower-json-0.6.0"
       sources."bower-logger-0.2.1"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       sources."lodash-4.2.1"
@@ -18586,11 +19110,11 @@ in
       sources."object-assign-2.1.1"
       sources."prepend-http-1.0.4"
       sources."read-all-stream-2.2.0"
-      sources."statuses-1.3.0"
+      sources."statuses-1.3.1"
       sources."timed-out-2.0.0"
       sources."end-of-stream-1.0.0"
       sources."inherits-2.0.3"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
@@ -18627,12 +19151,12 @@ in
       sources."pinkie-2.0.4"
       (sources."load-json-file-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       sources."parse-json-2.2.0"
@@ -18652,12 +19176,12 @@ in
       sources."natives-1.1.0"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       sources."path-is-absolute-1.0.1"
@@ -18673,13 +19197,13 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."os-tmpdir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -18738,12 +19262,12 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."resolve-1.1.7"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.4.1"
+      sources."stream-http-2.5.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -18809,9 +19333,9 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.8.1"
+      sources."asn1.js-4.9.0"
       sources."ripemd160-1.0.1"
-      sources."sha.js-2.4.5"
+      sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
@@ -18868,7 +19392,7 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."fs-extended-0.2.1"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -18907,7 +19431,7 @@ in
       (sources."xml2js-0.4.17" // {
         dependencies = [
           sources."xmlbuilder-4.2.1"
-          sources."lodash-4.16.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."xtend-4.0.1"
@@ -18936,7 +19460,7 @@ in
       sources."thunky-0.1.0"
       sources."wrap-fn-0.1.5"
       sources."co-3.1.0"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."object-assign-1.0.0"
       (sources."meow-3.7.0" // {
         dependencies = [
@@ -18970,7 +19494,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -19020,13 +19544,13 @@ in
         ];
       })
       sources."windows-no-runnable-0.0.6"
-      (sources."mdns-js-0.5.0" // {
+      (sources."mdns-js-0.5.1" // {
         dependencies = [
           sources."semver-5.1.1"
         ];
       })
       sources."plist-2.0.1"
-      sources."mdns-js-packet-0.2.0"
+      sources."dns-js-0.2.1"
       sources."qap-3.1.3"
       sources."base64-js-1.1.2"
       sources."xmlbuilder-8.2.2"
@@ -19044,7 +19568,7 @@ in
       sources."mute-stream-0.0.4"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.4"
+      sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
       sources."simple-get-2.3.0"
       sources."thirty-two-1.0.2"
@@ -19091,7 +19615,7 @@ in
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
       sources."inherits-2.0.3"
-      sources."ip-1.1.3"
+      sources."ip-1.1.4"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -19141,13 +19665,13 @@ in
       sources."run-series-1.1.4"
       (sources."simple-peer-6.0.7" // {
         dependencies = [
-          sources."readable-stream-2.1.5"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
       (sources."simple-websocket-4.1.0" // {
         dependencies = [
-          sources."readable-stream-2.1.5"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
@@ -19198,7 +19722,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."exit-on-epipe-0.0.1"
+      sources."exit-on-epipe-0.1.0"
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
@@ -19254,7 +19778,7 @@ in
       (sources."insight-0.8.3" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."request-2.76.0"
+          sources."request-2.79.0"
           sources."qs-6.3.0"
         ];
       })
@@ -19273,7 +19797,7 @@ in
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
       sources."unorm-1.4.1"
-      sources."big-integer-1.6.16"
+      sources."big-integer-1.6.17"
       sources."sax-0.3.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -19324,9 +19848,11 @@ in
           sources."glob-7.0.6"
           sources."nopt-3.0.6"
           sources."npm-package-arg-4.1.1"
+          sources."readable-stream-2.1.5"
           sources."request-2.74.0"
           sources."semver-5.1.1"
           sources."tar-2.2.1"
+          sources."isarray-1.0.0"
           sources."form-data-1.0.1"
         ];
       })
@@ -19417,7 +19943,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.1.5" // {
+      (sources."readable-stream-2.2.2" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
@@ -19425,7 +19951,7 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.4.1"
+      sources."stream-http-2.5.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -19488,9 +20014,9 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.8.1"
+      sources."asn1.js-4.9.0"
       sources."ripemd160-1.0.1"
-      sources."sha.js-2.4.5"
+      sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.4"
@@ -19527,13 +20053,13 @@ in
       sources."ansi-regex-2.0.0"
       sources."accepts-1.3.3"
       sources."bytes-2.3.0"
-      sources."compressible-2.0.8"
+      sources."compressible-2.0.9"
       sources."debug-2.2.0"
       sources."on-headers-1.0.1"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -19556,21 +20082,17 @@ in
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
-      sources."statuses-1.3.0"
+      sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
       sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
-      (sources."http-errors-1.5.0" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."http-errors-1.5.1"
       sources."mime-1.3.4"
-      sources."setprototypeof-1.0.1"
+      sources."setprototypeof-1.0.2"
       sources."media-typer-0.3.0"
       sources."npm-package-arg-4.2.0"
       sources."promzard-0.3.0"
@@ -19586,7 +20108,7 @@ in
       sources."mute-stream-0.0.6"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."jju-1.3.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -19633,7 +20155,7 @@ in
       sources."npm-install-checks-1.0.7"
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
-          sources."request-2.76.0"
+          sources."request-2.79.0"
           sources."qs-6.3.0"
         ];
       })
@@ -19654,7 +20176,7 @@ in
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."write-file-atomic-1.1.4"
       sources."imurmurhash-0.1.4"
       sources."wcwidth-1.0.1"
@@ -19678,18 +20200,18 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
@@ -19747,9 +20269,10 @@ in
           sources."isarray-1.0.0"
         ];
       })
+      sources."node-uuid-1.4.7"
       (sources."async-2.1.2" // {
         dependencies = [
-          sources."lodash-4.16.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."isexe-1.1.2"
@@ -19762,12 +20285,15 @@ in
       })
       sources."bplist-creator-0.0.4"
       sources."stream-buffers-0.2.6"
-      sources."configstore-1.4.0"
+      (sources."configstore-1.4.0" // {
+        dependencies = [
+          sources."uuid-2.0.3"
+        ];
+      })
       sources."inquirer-0.10.1"
       sources."lodash.debounce-3.1.1"
       sources."object-assign-4.1.0"
       sources."os-name-1.0.3"
-      sources."uuid-2.0.3"
       sources."xdg-basedir-2.0.0"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
@@ -19783,7 +20309,7 @@ in
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."lodash._getnative-3.9.1"
@@ -19927,9 +20453,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -19953,7 +20479,7 @@ in
       })
       sources."binaryheap-0.0.3"
       sources."buffercursor-0.0.12"
-      sources."verror-1.8.1"
+      sources."verror-1.9.0"
       sources."assert-plus-1.0.0"
       sources."core-util-is-1.0.2"
       sources."extsprintf-1.3.0"
@@ -19998,7 +20524,7 @@ in
     };
     dependencies = [
       sources."JSONStream-0.8.4"
-      sources."basic-auth-1.0.4"
+      sources."basic-auth-1.1.0"
       sources."cookie-signature-1.0.6"
       sources."cors-2.8.1"
       sources."docker-parse-image-3.0.1"
@@ -20055,7 +20581,7 @@ in
               sources."readable-stream-2.0.6"
             ];
           })
-          sources."readable-stream-2.1.5"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
@@ -20079,7 +20605,7 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.1.5"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
@@ -20090,9 +20616,9 @@ in
       sources."util-deprecate-1.0.2"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
-      sources."ltgt-2.1.2"
+      sources."ltgt-2.1.3"
       sources."pull-level-2.0.3"
-      sources."pull-stream-3.4.5"
+      sources."pull-stream-3.5.0"
       sources."typewiselite-1.0.0"
       sources."bytewise-core-1.2.3"
       sources."typewise-1.0.3"
@@ -20149,10 +20675,10 @@ in
       sources."async-2.0.1"
       sources."aws4-1.5.0"
       sources."optimist-0.6.1"
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."jsonparse-1.2.0"
       sources."through-2.3.8"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
@@ -20160,20 +20686,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -20223,7 +20749,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -20244,7 +20770,7 @@ in
     };
     dependencies = [
       sources."chalk-1.1.3"
-      sources."got-6.5.0"
+      sources."got-6.6.3"
       sources."has-ansi-2.0.0"
       sources."lodash.debounce-4.0.8"
       sources."log-update-1.0.2"
@@ -20263,7 +20789,7 @@ in
       sources."is-stream-1.1.0"
       sources."lowercase-keys-1.0.0"
       sources."node-status-codes-2.0.1"
-      sources."timed-out-2.0.0"
+      sources."timed-out-3.0.0"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
@@ -20302,7 +20828,7 @@ in
       sources."path-exists-2.1.0"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -20327,16 +20853,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.9.0";
+    version = "3.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz";
-      sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
     };
     dependencies = [
       sources."babel-code-frame-6.16.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.5.2"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.3.2"
@@ -20344,23 +20870,23 @@ in
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.1"
-      sources."globals-9.12.0"
+      sources."globals-9.14.0"
       sources."ignore-3.2.0"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.15.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.6.1"
+      sources."js-yaml-3.7.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
       sources."path-is-inside-1.0.2"
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
-      sources."require-uncached-1.0.2"
+      sources."require-uncached-1.0.3"
       sources."shelljs-0.7.5"
       sources."strip-bom-3.0.0"
       sources."strip-json-comments-1.0.4"
@@ -20387,7 +20913,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."es6-map-0.1.4"
       sources."es6-weak-map-2.0.1"
       (sources."esrecurse-4.1.0" // {
@@ -20411,7 +20937,7 @@ in
       sources."flat-cache-1.2.1"
       sources."circular-json-0.3.1"
       sources."del-2.2.2"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."write-0.2.1"
       sources."globby-5.0.0"
       sources."is-path-cwd-1.0.0"
@@ -20445,7 +20971,7 @@ in
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."mute-stream-0.0.5"
       sources."number-is-nan-1.0.1"
@@ -20471,7 +20997,7 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."resolve-1.1.7"
-      sources."ajv-4.8.2"
+      sources."ajv-4.9.0"
       sources."ajv-keywords-1.1.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -20511,7 +21037,7 @@ in
     dependencies = [
       sources."bower-endpoint-parser-0.2.1"
       sources."bower-logger-0.2.1"
-      sources."bower-1.7.9"
+      sources."bower-1.8.0"
       sources."glob-3.2.11"
       sources."inherits-2.0.3"
       sources."minimatch-0.3.0"
@@ -20528,10 +21054,10 @@ in
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";
-    version = "0.15.2";
+    version = "0.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz";
-      sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9";
+      url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz";
+      sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2";
     };
     dependencies = [
       (sources."cliff-0.1.10" // {
@@ -20546,7 +21072,7 @@ in
           sources."optimist-0.6.0"
         ];
       })
-      sources."forever-monitor-1.6.0"
+      sources."forever-monitor-1.7.1"
       (sources."nconf-0.6.9" // {
         dependencies = [
           sources."async-0.2.9"
@@ -20591,7 +21117,7 @@ in
       sources."revalidator-0.1.8"
       sources."mute-stream-0.0.6"
       sources."chokidar-1.6.1"
-      sources."minimatch-2.0.10"
+      sources."minimatch-3.0.3"
       sources."ps-tree-0.0.3"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
@@ -20599,12 +21125,8 @@ in
       sources."inherits-2.0.3"
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
-      (sources."readdirp-2.1.0" // {
-        dependencies = [
-          sources."minimatch-3.0.3"
-        ];
-      })
-      sources."fsevents-1.0.14"
+      sources."readdirp-2.1.0"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -20639,12 +21161,9 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.7.0"
-      sources."graceful-fs-4.1.9"
-      sources."readable-stream-2.1.5"
+      sources."graceful-fs-4.1.10"
+      sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
-      sources."brace-expansion-1.1.6"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
@@ -20658,25 +21177,26 @@ in
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
         ];
       })
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.6.0" // {
+      (sources."gauge-2.7.1" // {
         dependencies = [
           sources."object-assign-4.1.0"
         ];
@@ -20690,7 +21210,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
@@ -20703,20 +21223,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -20764,13 +21284,9 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
-      (sources."glob-7.1.1" // {
-        dependencies = [
-          sources."minimatch-3.0.3"
-        ];
-      })
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
@@ -20778,13 +21294,12 @@ in
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
       sources."debug-2.2.0"
-      (sources."fstream-ignore-1.0.5" // {
-        dependencies = [
-          sources."minimatch-3.0.3"
-        ];
-      })
+      sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
       (sources."event-stream-0.5.3" // {
         dependencies = [
           sources."optimist-0.2.8"
@@ -20883,7 +21398,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.20" // {
+      (sources."clean-css-3.4.21" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -20913,7 +21428,7 @@ in
       })
       sources."source-map-0.4.4"
       sources."graceful-readlink-1.0.1"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
       sources."acorn-2.7.0"
       sources."is-promise-2.1.0"
       sources."promise-6.1.0"
@@ -20948,7 +21463,7 @@ in
       sources."weak-map-1.0.5"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       sources."nan-2.4.0"
     ];
     buildInputs = globalBuildInputs;
@@ -20974,8 +21489,8 @@ in
       sources."interpret-1.0.1"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
-      sources."orchestrator-0.3.7"
-      sources."pretty-hrtime-1.0.2"
+      sources."orchestrator-0.3.8"
+      sources."pretty-hrtime-1.0.3"
       sources."semver-4.3.6"
       sources."tildify-1.2.0"
       sources."v8flags-2.0.11"
@@ -20997,7 +21512,7 @@ in
       sources."ansi-regex-2.0.0"
       sources."array-differ-1.0.0"
       sources."array-uniq-1.0.3"
-      sources."beeper-1.1.0"
+      sources."beeper-1.1.1"
       sources."dateformat-1.0.12"
       sources."fancy-log-1.2.0"
       sources."gulplog-1.0.0"
@@ -21048,7 +21563,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -21142,7 +21657,7 @@ in
       sources."is-windows-0.2.0"
       sources."ini-1.3.4"
       sources."osenv-0.1.3"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."os-tmpdir-1.0.2"
       sources."isexe-1.1.2"
       sources."lodash.assignwith-4.2.0"
@@ -21319,12 +21834,12 @@ in
       sources."escodegen-1.8.1"
       sources."esprima-2.7.3"
       sources."glob-5.0.15"
-      (sources."handlebars-4.0.5" // {
+      (sources."handlebars-4.0.6" // {
         dependencies = [
           sources."source-map-0.4.4"
         ];
       })
-      sources."js-yaml-3.6.1"
+      sources."js-yaml-3.7.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -21334,7 +21849,7 @@ in
       sources."once-1.4.0"
       sources."resolve-1.1.7"
       sources."supports-color-3.1.2"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."wordwrap-1.0.0"
       sources."estraverse-1.9.3"
       sources."esutils-2.0.2"
@@ -21345,7 +21860,7 @@ in
       sources."type-check-0.3.2"
       sources."levn-0.3.0"
       sources."fast-levenshtein-2.0.5"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
@@ -21500,10 +22015,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.6.1";
+    version = "3.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
-      sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -21533,7 +22048,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.16.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."connect-3.5.0"
@@ -21549,7 +22064,7 @@ in
         ];
       })
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."http-proxy-1.15.2"
       sources."isbinaryfile-3.0.1"
       sources."lodash-3.10.1"
@@ -21574,21 +22089,21 @@ in
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.0"
+      sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.13"
       sources."on-finished-2.3.0"
       sources."qs-6.2.0"
       sources."raw-body-2.1.7"
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."ms-0.7.1"
-      sources."inherits-2.0.1"
-      sources."setprototypeof-1.0.1"
-      sources."statuses-1.3.0"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.2"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.12"
-      sources."mime-db-1.24.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -21596,7 +22111,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.14"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -21631,7 +22146,7 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.7.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -21642,25 +22157,29 @@ in
       sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      (sources."request-2.76.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
         ];
       })
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      sources."tar-pack-3.3.0"
+      (sources."tar-pack-3.3.0" // {
+        dependencies = [
+          sources."readable-stream-2.1.5"
+        ];
+      })
       sources."minimist-0.0.8"
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
@@ -21671,7 +22190,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
@@ -21684,18 +22203,18 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -21911,9 +22430,11 @@ in
       })
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.6" // {
+      (sources."method-override-2.3.7" // {
         dependencies = [
+          sources."debug-2.3.3"
           sources."vary-1.1.0"
+          sources."ms-0.7.2"
         ];
       })
       sources."morgan-1.6.1"
@@ -21921,8 +22442,16 @@ in
       sources."on-headers-1.0.1"
       sources."pause-0.1.0"
       sources."qs-4.0.0"
-      sources."response-time-2.3.1"
-      sources."serve-favicon-2.3.0"
+      (sources."response-time-2.3.2" // {
+        dependencies = [
+          sources."depd-1.1.0"
+        ];
+      })
+      (sources."serve-favicon-2.3.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
       (sources."serve-index-1.7.3" // {
         dependencies = [
           sources."escape-html-1.0.3"
@@ -21936,7 +22465,7 @@ in
           sources."statuses-1.2.1"
         ];
       })
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."vhost-3.0.2"
       sources."iconv-lite-0.4.11"
       sources."on-finished-2.3.0"
@@ -21949,20 +22478,20 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.8"
-      sources."mime-types-2.1.12"
+      sources."compressible-2.0.9"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
-      sources."csrf-3.0.3"
-      sources."base64-url-1.2.2"
+      sources."csrf-3.0.4"
+      sources."base64-url-1.3.3"
       sources."rndm-1.2.0"
       sources."tsscmp-1.0.5"
-      sources."uid-safe-2.1.1"
+      sources."uid-safe-2.1.3"
       sources."random-bytes-1.0.0"
       sources."crc-3.3.0"
       sources."inherits-2.0.3"
-      sources."statuses-1.3.0"
+      sources."statuses-1.3.1"
       sources."readable-stream-1.1.14"
       sources."stream-counter-0.2.0"
       sources."core-util-is-1.0.2"
@@ -21984,7 +22513,7 @@ in
       sources."uid2-0.0.3"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22024,7 +22553,7 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
@@ -22211,7 +22740,7 @@ in
       sources."nijs-0.0.23"
       sources."chownr-1.0.1"
       sources."concat-stream-1.5.2"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.3.5"
       (sources."npm-package-arg-4.2.0" // {
@@ -22220,7 +22749,7 @@ in
         ];
       })
       sources."once-1.4.0"
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."retry-0.8.0"
       sources."rimraf-2.5.4"
       sources."slide-1.1.6"
@@ -22248,20 +22777,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22311,7 +22840,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -22333,7 +22862,7 @@ in
       sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."config-chain-1.1.11"
@@ -22377,18 +22906,18 @@ in
     dependencies = [
       sources."fstream-1.0.10"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-3.1.2"
       sources."osenv-0.1.3"
       sources."path-array-1.0.1"
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."inherits-2.0.3"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -22405,7 +22934,7 @@ in
       sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -22420,16 +22949,16 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."array-index-1.0.0"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."es6-symbol-3.1.0"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."d-0.1.1"
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
@@ -22439,20 +22968,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22500,7 +23029,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-1.1.2"
@@ -22524,17 +23053,22 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.2.0"
-      sources."express-4.14.0"
+      sources."debug-2.3.3"
+      (sources."express-4.14.0" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
       sources."rc-1.1.6"
       sources."semver-4.3.6"
-      sources."serve-favicon-2.3.0"
+      sources."serve-favicon-2.3.2"
       sources."strong-data-uri-1.0.4"
       sources."v8-debug-0.7.7"
       sources."v8-profiler-5.6.5"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."ws-1.1.1"
       sources."yargs-3.32.0"
       sources."browser-launcher2-0.4.6"
@@ -22572,7 +23106,7 @@ in
       sources."bplist-parser-0.1.1"
       sources."meow-3.7.0"
       sources."untildify-2.1.0"
-      sources."big-integer-1.6.16"
+      sources."big-integer-1.6.17"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -22600,7 +23134,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -22613,7 +23147,7 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -22624,7 +23158,12 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.5.0"
+      (sources."finalhandler-0.5.0" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -22634,24 +23173,29 @@ in
       sources."proxy-addr-1.1.2"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
-      sources."send-0.14.1"
+      (sources."send-0.14.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."serve-static-1.11.1"
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.24.0"
-      sources."statuses-1.3.0"
+      sources."mime-db-1.25.0"
+      sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
       sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
-      sources."http-errors-1.5.0"
+      sources."http-errors-1.5.1"
       sources."mime-1.3.4"
-      sources."inherits-2.0.1"
-      sources."setprototypeof-1.0.1"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.2"
       sources."media-typer-0.3.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
@@ -22673,8 +23217,8 @@ in
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
-      (sources."request-2.76.0" // {
+      sources."npmlog-4.0.1"
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
         ];
@@ -22682,18 +23226,21 @@ in
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."debug-2.2.0"
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
           sources."rimraf-2.5.4"
+          sources."ms-0.7.1"
           sources."glob-7.1.1"
         ];
       })
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -22705,7 +23252,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.0.0"
       sources."aws-sign2-0.6.0"
@@ -22714,18 +23261,18 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22805,33 +23352,34 @@ in
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
         ];
       })
       sources."minimist-0.0.8"
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
       sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
@@ -22843,7 +23391,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
@@ -22856,20 +23404,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22917,7 +23465,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -22931,7 +23479,7 @@ in
       sources."concat-map-0.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."debug-2.2.0"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
@@ -22955,7 +23503,11 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      sources."debug-2.2.0"
+      (sources."debug-2.3.3" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
       sources."es6-promise-3.3.1"
       sources."ignore-by-default-1.0.1"
       sources."lodash.defaults-3.1.2"
@@ -22976,7 +23528,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.14"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -23011,8 +23563,8 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.7.0"
-      sources."graceful-fs-4.1.9"
-      sources."readable-stream-2.1.5"
+      sources."graceful-fs-4.1.10"
+      sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -23023,26 +23575,28 @@ in
       sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."debug-2.2.0"
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
         ];
       })
       sources."minimist-0.0.8"
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
@@ -23053,7 +23607,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
@@ -23066,20 +23620,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -23127,7 +23681,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23161,7 +23715,11 @@ in
       sources."pause-stream-0.0.11"
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
-      sources."configstore-1.4.0"
+      (sources."configstore-1.4.0" // {
+        dependencies = [
+          sources."uuid-2.0.3"
+        ];
+      })
       sources."is-npm-1.0.0"
       sources."latest-version-1.0.1"
       sources."repeating-1.1.3"
@@ -23169,7 +23727,6 @@ in
       sources."string-length-1.0.1"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.3"
-      sources."uuid-2.0.3"
       sources."write-file-atomic-1.2.0"
       sources."xdg-basedir-2.0.0"
       sources."os-homedir-1.0.2"
@@ -23255,17 +23812,17 @@ in
       sources."when-3.7.7"
       sources."ws-0.8.1"
       sources."xml2js-0.4.17"
-      sources."node-red-node-feedparser-0.1.6"
-      sources."node-red-node-email-0.1.11"
-      (sources."node-red-node-twitter-0.1.7" // {
+      sources."node-red-node-feedparser-0.1.7"
+      sources."node-red-node-email-0.1.12"
+      (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
-          sources."request-2.76.0"
-          sources."form-data-2.1.1"
+          sources."request-2.79.0"
+          sources."form-data-2.1.2"
           sources."qs-6.3.0"
         ];
       })
-      sources."node-red-node-rbe-0.1.5"
-      sources."node-red-node-serialport-0.4.0"
+      sources."node-red-node-rbe-0.1.6"
+      sources."node-red-node-serialport-0.4.1"
       (sources."bcrypt-0.8.7" // {
         dependencies = [
           sources."nan-2.3.5"
@@ -23275,18 +23832,18 @@ in
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.0"
+      sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.13"
       sources."on-finished-2.3.0"
       sources."qs-6.2.0"
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."ms-0.7.1"
-      sources."inherits-2.0.1"
-      sources."setprototypeof-1.0.1"
-      sources."statuses-1.3.0"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.2"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."mime-types-2.1.12"
-      sources."mime-db-1.24.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -23313,7 +23870,7 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23323,8 +23880,8 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
-      sources."moment-timezone-0.5.7"
-      sources."moment-2.15.2"
+      sources."moment-timezone-0.5.9"
+      sources."moment-2.16.0"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -23349,7 +23906,7 @@ in
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."stream-consume-0.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -23365,7 +23922,7 @@ in
       sources."concat-map-0.0.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
-      sources."cookies-0.6.1"
+      sources."cookies-0.6.2"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
@@ -23393,7 +23950,7 @@ in
       sources."pump-1.0.1"
       sources."reinterval-1.1.0"
       sources."split2-2.1.0"
-      (sources."websocket-stream-3.3.0" // {
+      (sources."websocket-stream-3.3.3" // {
         dependencies = [
           sources."ws-1.1.1"
         ];
@@ -23525,7 +24082,7 @@ in
       sources."nan-2.4.0"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       (sources."feedparser-1.1.3" // {
         dependencies = [
           sources."sax-0.6.1"
@@ -23649,17 +24206,23 @@ in
         ];
       })
       sources."encoding-0.1.12"
-      sources."uue-3.0.0"
+      sources."uue-3.1.0"
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
+      sources."uuid-3.0.0"
       sources."asynckit-0.4.0"
-      sources."serialport-4.0.3"
+      (sources."serialport-4.0.6" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."lie-3.1.0"
       (sources."node-pre-gyp-0.6.31" // {
         dependencies = [
-          sources."request-2.76.0"
-          sources."form-data-2.1.1"
+          sources."request-2.79.0"
+          sources."form-data-2.1.2"
           sources."qs-6.3.0"
         ];
       })
@@ -23670,17 +24233,18 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       sources."rc-1.1.6"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
         ];
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
@@ -23690,7 +24254,7 @@ in
       sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."deep-extend-0.4.1"
@@ -23762,14 +24326,14 @@ in
       sources."range-parser-0.0.4"
       sources."mkdirp-0.3.5"
       sources."cookie-0.0.5"
-      sources."buffer-crc32-0.2.5"
+      sources."buffer-crc32-0.2.6"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.2.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."ms-0.7.2"
         ];
       })
       sources."qs-0.5.1"
@@ -23821,7 +24385,7 @@ in
       sources."xoauth2-0.1.8"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
-      (sources."raw-socket-1.5.0" // {
+      (sources."raw-socket-1.5.1" // {
         dependencies = [
           sources."nan-2.3.5"
         ];
@@ -23841,12 +24405,13 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "3.10.9";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
-      sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
+      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
     };
     dependencies = [
+      sources."JSONStream-1.2.1"
       sources."abbrev-1.0.9"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
@@ -23864,7 +24429,7 @@ in
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -23882,6 +24447,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
+      sources."mississippi-1.2.0"
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.4.0" // {
         dependencies = [
@@ -23894,13 +24460,17 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.2.1" // {
+      (sources."npm-registry-client-7.3.0" // {
         dependencies = [
           sources."npmlog-3.1.2"
         ];
       })
       sources."npm-user-validate-0.1.5"
-      sources."npmlog-4.0.0"
+      (sources."npmlog-4.0.1" // {
+        dependencies = [
+          sources."gauge-2.7.1"
+        ];
+      })
       sources."once-1.4.0"
       sources."opener-1.4.2"
       sources."osenv-0.1.3"
@@ -23916,13 +24486,20 @@ in
       sources."read-package-tree-5.1.5"
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.75.0"
+      sources."request-2.78.0"
       sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
+      (sources."sorted-union-stream-2.1.3" // {
+        dependencies = [
+          sources."from2-1.3.0"
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
@@ -23931,7 +24508,7 @@ in
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
       sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
       sources."ansi-regex-2.0.0"
@@ -23945,6 +24522,8 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
+      sources."jsonparse-1.2.0"
+      sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
@@ -23959,6 +24538,40 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
+      (sources."concat-stream-1.5.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      (sources."duplexify-3.5.0" // {
+        dependencies = [
+          sources."end-of-stream-1.0.0"
+          sources."once-1.3.3"
+        ];
+      })
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."flush-write-stream-1.0.2"
+      sources."from2-2.3.0"
+      sources."pump-1.0.1"
+      sources."pumpify-1.3.5"
+      sources."stream-each-1.2.0"
+      (sources."through2-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."typedarray-0.0.6"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
+      sources."stream-shift-1.0.0"
+      sources."xtend-4.0.1"
       sources."minimist-0.0.8"
       sources."path-array-1.0.1"
       sources."are-we-there-yet-1.1.2"
@@ -23971,29 +24584,18 @@ in
       sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."es6-symbol-3.1.0"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."d-0.1.1"
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      sources."typedarray-0.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."mute-stream-0.0.6"
@@ -24003,26 +24605,21 @@ in
       sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -24040,7 +24637,6 @@ in
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24073,8 +24669,9 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
+      sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
@@ -24131,7 +24728,7 @@ in
       sources."coffee-script-1.11.1"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."graceful-fs-2.0.3"
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
@@ -24139,27 +24736,27 @@ in
       sources."rimraf-2.5.4"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -24209,7 +24806,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24224,10 +24821,10 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -24241,7 +24838,7 @@ in
       sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       (sources."config-chain-1.1.11" // {
@@ -24298,9 +24895,9 @@ in
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."lodash-4.16.4"
+      sources."lodash-4.17.2"
       sources."node-alias-1.0.4"
-      sources."npm-3.10.9"
+      sources."npm-3.10.10"
       (sources."npmi-2.0.1" // {
         dependencies = [
           sources."semver-4.3.6"
@@ -24340,7 +24937,7 @@ in
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -24376,7 +24973,11 @@ in
         ];
       })
       sources."npm-user-validate-0.1.5"
-      sources."npmlog-4.0.0"
+      (sources."npmlog-4.0.1" // {
+        dependencies = [
+          sources."gauge-2.7.1"
+        ];
+      })
       sources."once-1.4.0"
       sources."opener-1.4.2"
       sources."osenv-0.1.3"
@@ -24405,7 +25006,7 @@ in
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
       sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
       sources."debuglog-1.0.1"
@@ -24444,13 +25045,13 @@ in
       sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."es6-symbol-3.1.0"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."d-0.1.1"
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
@@ -24490,7 +25091,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
@@ -24535,7 +25136,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
@@ -24562,12 +25163,11 @@ in
       sources."uuid-2.0.3"
       sources."is-obj-1.0.1"
       sources."package-json-2.4.0"
-      sources."got-5.6.0"
+      sources."got-5.7.1"
       sources."registry-auth-token-3.1.0"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer2-0.1.4"
-      sources."is-plain-obj-1.1.0"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
@@ -24575,8 +25175,8 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."timed-out-2.0.0"
-      sources."unzip-response-1.0.1"
+      sources."timed-out-3.0.0"
+      sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."error-ex-1.3.0"
@@ -24598,6 +25198,357 @@ in
     };
     production = true;
   };
+  parsoid = nodeEnv.buildNodePackage {
+    name = "parsoid";
+    packageName = "parsoid";
+    version = "0.6.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz";
+      sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723";
+    };
+    dependencies = [
+      sources."async-0.9.2"
+      sources."babybird-0.0.1"
+      (sources."body-parser-1.15.2" // {
+        dependencies = [
+          sources."content-type-1.0.2"
+        ];
+      })
+      (sources."compression-1.6.2" // {
+        dependencies = [
+          sources."bytes-2.3.0"
+        ];
+      })
+      sources."connect-busboy-0.0.2"
+      sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+      sources."core-js-2.4.1"
+      sources."diff-1.4.0"
+      sources."domino-1.0.27"
+      sources."entities-1.1.1"
+      (sources."express-4.14.0" // {
+        dependencies = [
+          sources."content-type-1.0.2"
+          sources."finalhandler-0.5.0"
+        ];
+      })
+      sources."express-handlebars-3.0.0"
+      sources."finalhandler-0.5.1"
+      sources."gelf-stream-0.2.4"
+      sources."js-yaml-3.7.0"
+      sources."mediawiki-title-0.5.6"
+      sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
+      sources."node-uuid-1.4.7"
+      sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
+      sources."prfun-2.1.4"
+      (sources."request-2.79.0" // {
+        dependencies = [
+          sources."qs-6.3.0"
+        ];
+      })
+      sources."semver-5.3.0"
+      (sources."serve-favicon-2.3.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."service-runner-2.1.11" // {
+        dependencies = [
+          sources."gelf-stream-1.1.1"
+          sources."yargs-5.0.0"
+          sources."gelfling-0.3.1"
+          sources."cliui-3.2.0"
+          sources."window-size-0.2.0"
+        ];
+      })
+      sources."simplediff-0.1.1"
+      (sources."yargs-4.8.1" // {
+        dependencies = [
+          sources."cliui-3.2.0"
+          sources."window-size-0.2.0"
+          sources."yargs-parser-2.4.1"
+          sources."camelcase-3.0.0"
+        ];
+      })
+      sources."asap-2.0.5"
+      sources."is-arguments-1.0.2"
+      sources."bytes-2.4.0"
+      sources."debug-2.2.0"
+      sources."depd-1.1.0"
+      sources."http-errors-1.5.1"
+      sources."iconv-lite-0.4.13"
+      sources."on-finished-2.3.0"
+      sources."qs-6.2.0"
+      sources."raw-body-2.1.7"
+      sources."type-is-1.6.14"
+      sources."ms-0.7.1"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.2"
+      sources."statuses-1.3.1"
+      sources."ee-first-1.1.1"
+      sources."unpipe-1.0.0"
+      sources."media-typer-0.3.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
+      sources."accepts-1.3.3"
+      sources."compressible-2.0.9"
+      sources."on-headers-1.0.1"
+      sources."vary-1.1.0"
+      sources."busboy-0.2.13"
+      sources."dicer-0.2.5"
+      sources."readable-stream-1.1.14"
+      sources."streamsearch-0.1.2"
+      sources."core-util-is-1.0.2"
+      sources."isarray-0.0.1"
+      sources."string_decoder-0.10.31"
+      sources."array-flatten-1.1.1"
+      sources."content-disposition-0.5.1"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."encodeurl-1.0.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.7.0"
+      sources."fresh-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."parseurl-1.3.1"
+      sources."path-to-regexp-0.1.7"
+      sources."proxy-addr-1.1.2"
+      sources."range-parser-1.2.0"
+      sources."send-0.14.1"
+      sources."serve-static-1.11.1"
+      sources."utils-merge-1.0.0"
+      sources."forwarded-0.1.0"
+      sources."ipaddr.js-1.1.1"
+      sources."destroy-1.0.4"
+      sources."mime-1.3.4"
+      sources."glob-6.0.4"
+      sources."graceful-fs-4.1.10"
+      (sources."handlebars-4.0.6" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
+      sources."object.assign-4.0.4"
+      sources."promise-7.1.1"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."optimist-0.6.1"
+      sources."source-map-0.4.4"
+      (sources."uglify-js-2.7.4" // {
+        dependencies = [
+          sources."async-0.2.10"
+          sources."source-map-0.5.6"
+          sources."yargs-3.10.0"
+        ];
+      })
+      sources."wordwrap-0.0.3"
+      sources."minimist-0.0.10"
+      sources."amdefine-1.0.1"
+      sources."uglify-to-browserify-1.0.2"
+      sources."camelcase-1.2.1"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.0.4"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.4"
+      sources."function-bind-1.1.0"
+      sources."object-keys-1.0.11"
+      sources."define-properties-1.1.2"
+      sources."foreach-2.0.5"
+      sources."gelfling-0.2.0"
+      sources."argparse-1.0.9"
+      sources."esprima-2.7.3"
+      sources."sprintf-js-1.0.3"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.5.0"
+      sources."caseless-0.11.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.2"
+      sources."har-validator-2.0.6"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."chalk-1.1.3"
+      sources."commander-2.9.0"
+      sources."is-my-json-valid-2.15.0"
+      sources."pinkie-promise-2.0.1"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.0.0"
+      sources."graceful-readlink-1.0.1"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.0"
+      sources."xtend-4.0.1"
+      sources."is-property-1.0.2"
+      sources."pinkie-2.0.4"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      sources."jsprim-1.3.1"
+      (sources."sshpk-1.10.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.0"
+      sources."tweetnacl-0.14.3"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
+      sources."bluebird-3.4.6"
+      sources."bunyan-1.8.5"
+      sources."bunyan-syslog-udp-0.1.0"
+      sources."hot-shots-4.3.1"
+      (sources."limitation-0.1.9" // {
+        dependencies = [
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
+        ];
+      })
+      sources."dtrace-provider-0.8.0"
+      sources."mv-2.1.1"
+      sources."safe-json-stringify-1.0.3"
+      sources."moment-2.16.0"
+      sources."nan-2.4.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."ncp-2.0.0"
+      sources."rimraf-2.4.5"
+      sources."kad-git+https://github.com/gwicke/kad.git#master"
+      sources."clarinet-0.11.0"
+      sources."colors-1.1.2"
+      sources."hat-0.0.3"
+      (sources."kad-fs-0.0.4" // {
+        dependencies = [
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
+        ];
+      })
+      sources."kad-localstorage-0.0.7"
+      (sources."kad-memstore-0.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
+        ];
+      })
+      sources."lodash-3.10.1"
+      sources."merge-1.2.0"
+      (sources."msgpack5-3.4.1" // {
+        dependencies = [
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
+        ];
+      })
+      sources."buffer-shims-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."util-deprecate-1.0.2"
+      sources."dom-storage-2.0.2"
+      (sources."bl-1.1.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+          sources."isarray-1.0.0"
+        ];
+      })
+      sources."get-caller-file-1.0.2"
+      sources."lodash.assign-4.2.0"
+      sources."os-locale-1.4.0"
+      sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      sources."string-width-1.0.2"
+      sources."which-module-1.0.0"
+      sources."y18n-3.2.1"
+      (sources."yargs-parser-3.2.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
+      sources."wrap-ansi-2.0.0"
+      sources."lcid-1.0.0"
+      sources."invert-kv-1.0.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."normalize-package-data-2.3.5"
+      sources."path-type-1.1.0"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-utf8-0.2.1"
+      sources."hosted-git-info-2.1.5"
+      sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Mediawiki parser for the VisualEditor.";
+      homepage = "https://github.com/wikimedia/parsoid#readme";
+      license = "GPL-2.0+";
+    };
+    production = true;
+  };
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
@@ -24609,9 +25560,9 @@ in
     dependencies = [
       sources."airplayer-2.0.0"
       sources."clivas-0.2.0"
-      (sources."inquirer-1.2.2" // {
+      (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.16.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."keypress-0.2.1"
@@ -24657,7 +25608,7 @@ in
       sources."plist-1.2.0"
       sources."reverse-http-1.2.0"
       sources."stream-buffers-2.2.0"
-      sources."big-integer-1.6.16"
+      sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.0.6"
@@ -24686,7 +25637,7 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.0.0"
       sources."string-width-1.0.2"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-flatten-2.1.0"
@@ -24695,9 +25646,10 @@ in
       sources."dns-txt-2.0.2"
       sources."multicast-dns-6.1.0"
       sources."multicast-dns-service-types-1.1.0"
-      sources."dns-packet-1.1.0"
+      sources."dns-packet-1.1.1"
       sources."thunky-0.1.0"
-      sources."ip-1.1.3"
+      sources."ip-1.1.4"
+      sources."safe-buffer-5.0.1"
       sources."meow-3.7.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
@@ -24727,7 +25679,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -24759,7 +25711,7 @@ in
       sources."is-promise-2.1.0"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
-      sources."magnet-uri-5.1.4"
+      sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
       sources."simple-get-2.3.0"
       sources."thirty-two-1.0.2"
@@ -24833,7 +25785,7 @@ in
           sources."bencode-0.8.0"
         ];
       })
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
       sources."k-bucket-0.6.0"
@@ -24858,7 +25810,7 @@ in
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24871,10 +25823,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.0.30";
+    version = "0.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz";
-      sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
     };
     dependencies = [
       sources."connect-multiparty-1.2.5"
@@ -24889,7 +25841,11 @@ in
       sources."pump-1.0.1"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      sources."socket.io-0.9.17"
+      (sources."socket.io-1.6.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
       (sources."torrent-stream-0.18.1" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -25022,32 +25978,84 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      sources."socket.io-client-0.9.16"
-      sources."policyfile-0.0.4"
+      (sources."engine.io-1.8.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."cookie-0.3.1"
+        ];
+      })
+      sources."has-binary-0.1.7"
+      sources."object-assign-4.1.0"
+      (sources."socket.io-adapter-0.5.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
+      (sources."socket.io-client-1.6.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
+      (sources."socket.io-parser-2.3.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."component-emitter-1.1.2"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."ms-0.7.2"
+      (sources."accepts-1.3.3" // {
+        dependencies = [
+          sources."mime-types-2.1.13"
+          sources."negotiator-0.6.1"
+          sources."mime-db-1.25.0"
+        ];
+      })
       sources."base64id-0.1.0"
-      sources."redis-0.7.3"
-      sources."uglify-js-1.2.5"
-      (sources."ws-0.4.32" // {
+      (sources."engine.io-parser-1.3.1" // {
         dependencies = [
-          sources."commander-2.1.0"
+          sources."has-binary-0.1.6"
         ];
       })
-      sources."xmlhttprequest-1.4.2"
-      sources."active-x-obfuscator-0.0.1"
-      sources."nan-1.0.0"
-      sources."tinycolor-0.0.1"
+      sources."ws-1.1.1"
+      sources."after-0.8.1"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
-      sources."zeparser-0.0.5"
+      sources."ultron-1.0.2"
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      (sources."engine.io-client-1.8.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
+      sources."indexof-0.0.1"
+      sources."object-component-0.0.3"
+      sources."parseuri-0.0.5"
+      sources."to-array-0.1.4"
+      sources."component-inherit-0.0.3"
+      sources."has-cors-1.1.0"
+      sources."parsejson-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."xmlhttprequest-ssl-1.5.3"
+      sources."yeast-0.1.2"
+      sources."better-assert-1.0.2"
+      sources."callsite-1.0.0"
+      sources."json3-3.3.2"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.2.0"
+          sources."debug-2.3.3"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.2.0"
+          sources."debug-2.3.3"
         ];
       })
       sources."bncode-0.5.3"
@@ -25056,7 +26064,7 @@ in
       sources."ip-0.3.3"
       (sources."ip-set-1.0.1" // {
         dependencies = [
-          sources."ip-1.1.3"
+          sources."ip-1.1.4"
         ];
       })
       sources."peer-wire-swarm-0.9.2"
@@ -25071,9 +26079,8 @@ in
       sources."run-parallel-1.1.6"
       sources."simple-get-1.4.3"
       sources."string2compact-1.2.2"
-      sources."ms-0.7.1"
       sources."ip-regex-1.0.3"
-      sources."unzip-response-1.0.1"
+      sources."unzip-response-1.0.2"
       sources."ipaddr.js-1.2.0"
       sources."bn.js-1.3.0"
       sources."extend.js-0.0.2"
@@ -25098,7 +26105,7 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."isexe-1.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -25125,7 +26132,7 @@ in
       sources."progress-1.1.8"
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."concat-stream-1.5.0"
       sources."debug-0.7.4"
       sources."mkdirp-0.5.0"
@@ -25141,7 +26148,7 @@ in
       sources."minimist-0.0.8"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -25164,7 +26171,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -25179,8 +26186,8 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.2"
-      sources."lodash-4.16.4"
-      sources."mime-db-1.24.0"
+      sources."lodash-4.17.2"
+      sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
       (sources."sshpk-1.10.1" // {
@@ -25257,7 +26264,7 @@ in
       sources."commander-2.9.0"
       sources."detective-4.3.2"
       sources."glob-5.0.15"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."iconv-lite-0.4.13"
       sources."mkdirp-0.5.1"
       sources."private-0.1.6"
@@ -25280,7 +26287,7 @@ in
       sources."source-map-0.5.6"
       sources."ast-types-0.8.15"
       sources."base62-0.1.1"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25340,7 +26347,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -25356,13 +26363,12 @@ in
       sources."inherits-2.0.3"
       sources."keypress-0.1.0"
       sources."mime-1.2.11"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"
       sources."request-2.9.203"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."request-2.76.0"
-          sources."node-uuid-1.4.7"
+          sources."request-2.79.0"
           sources."qs-6.3.0"
         ];
       })
@@ -25376,7 +26382,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       (sources."har-validator-2.0.6" // {
         dependencies = [
           sources."commander-2.9.0"
@@ -25387,11 +26393,12 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -25440,7 +26447,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -25494,13 +26501,13 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.6.1"
-      (sources."cookies-0.6.1" // {
+      sources."js-yaml-3.7.0"
+      (sources."cookies-0.6.2" // {
         dependencies = [
           sources."depd-1.1.0"
         ];
       })
-      (sources."request-2.76.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
         ];
@@ -25509,7 +26516,7 @@ in
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.4"
+      sources."bunyan-1.8.5"
       sources."handlebars-2.0.0"
       sources."highlight.js-8.9.1"
       sources."lunr-0.7.2"
@@ -25518,11 +26525,10 @@ in
       sources."JSONStream-1.2.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
-      (sources."http-errors-1.5.0" // {
+      (sources."http-errors-1.5.1" // {
         dependencies = [
-          sources."inherits-2.0.1"
-          sources."setprototypeof-1.0.1"
-          sources."statuses-1.3.0"
+          sources."setprototypeof-1.0.2"
+          sources."statuses-1.3.1"
         ];
       })
       (sources."readable-stream-1.1.14" // {
@@ -25573,12 +26579,12 @@ in
           sources."http-errors-1.3.1"
         ];
       })
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."vary-1.0.1"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
@@ -25593,7 +26599,7 @@ in
       sources."raw-body-1.3.4"
       sources."bytes-1.0.0"
       sources."iconv-lite-0.4.8"
-      sources."compressible-2.0.8"
+      sources."compressible-2.0.9"
       sources."on-headers-1.0.1"
       sources."graceful-readlink-1.0.1"
       sources."argparse-1.0.9"
@@ -25606,18 +26612,18 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -25668,10 +26674,10 @@ in
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.7.1"
+      sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.15.2"
+      sources."moment-2.16.0"
       sources."nan-2.4.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -25694,7 +26700,7 @@ in
       })
       sources."wordwrap-0.0.3"
       sources."source-map-0.1.43"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
       sources."markdown-it-4.4.0"
       sources."sanitize-html-1.13.0"
       sources."entities-1.1.1"
@@ -25703,7 +26709,7 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.1.5"
+          sources."readable-stream-2.2.2"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -25751,17 +26757,17 @@ in
       sources."readdirp-2.1.0"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."minimatch-3.0.3"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
       sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
@@ -25846,7 +26852,7 @@ in
       sources."semver-4.3.6"
       sources."spdy-1.32.5"
       sources."tunnel-agent-0.4.3"
-      (sources."verror-1.8.1" // {
+      (sources."verror-1.9.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25896,7 +26902,7 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."buffer-shims-1.0.0"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -25925,12 +26931,12 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.2.0"
+      sources."debug-2.3.3"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
       sources."minimist-0.0.8"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -25941,7 +26947,7 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25993,13 +26999,13 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.10";
+    version = "5.0.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz";
-      sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz";
+      sha1 = "dd0f7132475a5db6ea188222876d28538b47df27";
     };
     dependencies = [
-      sources."async-1.4.2"
+      sources."async-2.1.2"
       sources."colors-1.1.2"
       (sources."fields-0.1.24" // {
         dependencies = [
@@ -26007,68 +27013,71 @@ in
         ];
       })
       sources."humanize-0.0.9"
-      sources."longjohn-0.2.9"
-      sources."moment-2.10.6"
-      (sources."node-appc-0.2.31" // {
+      sources."longjohn-0.2.11"
+      sources."moment-2.16.0"
+      (sources."node-appc-0.2.39" // {
         dependencies = [
-          sources."request-2.61.0"
-          sources."semver-5.0.1"
+          sources."async-1.5.2"
+          sources."request-2.69.0"
+          sources."semver-5.1.0"
+          sources."wrench-1.5.8"
         ];
       })
-      (sources."request-2.62.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
-          sources."qs-5.1.0"
+          sources."form-data-2.1.2"
+          sources."qs-6.3.0"
+          sources."tough-cookie-2.3.2"
         ];
       })
-      sources."semver-5.0.3"
+      sources."semver-5.3.0"
       sources."sprintf-0.1.5"
       sources."temp-0.8.3"
-      (sources."winston-1.0.2" // {
+      (sources."winston-1.1.2" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
         ];
       })
-      sources."wrench-1.5.8"
+      sources."wrench-1.5.9"
+      sources."lodash-4.17.2"
       sources."keypress-0.2.1"
       sources."source-map-support-0.3.2"
       sources."source-map-0.1.32"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
       sources."adm-zip-0.4.7"
-      sources."diff-2.1.0"
-      sources."node-uuid-1.4.3"
+      sources."diff-2.2.1"
+      sources."node-uuid-1.4.7"
       sources."optimist-0.6.1"
-      (sources."uglify-js-2.4.24" // {
+      (sources."uglify-js-2.6.1" // {
         dependencies = [
           sources."async-0.2.10"
-          sources."source-map-0.1.34"
+          sources."source-map-0.5.6"
         ];
       })
-      sources."xmldom-0.1.19"
+      sources."xmldom-0.1.22"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.5.0"
       sources."bl-1.0.3"
       sources."caseless-0.11.0"
+      sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      (sources."form-data-1.0.1" // {
-        dependencies = [
-          sources."async-2.1.2"
-        ];
-      })
+      sources."form-data-1.0.1"
+      sources."har-validator-2.0.6"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."qs-4.0.0"
-      sources."tunnel-agent-0.4.3"
-      sources."tough-cookie-2.3.2"
-      sources."http-signature-0.11.0"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
-      sources."hawk-3.1.3"
-      sources."aws-sign2-0.5.0"
+      sources."qs-6.0.2"
       sources."stringstream-0.0.5"
-      sources."combined-stream-1.0.5"
-      sources."isstream-0.1.2"
-      sources."har-validator-1.8.0"
+      sources."tough-cookie-2.2.2"
+      sources."tunnel-agent-0.4.3"
       sources."readable-stream-2.0.6"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
@@ -26076,21 +27085,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."lodash-4.16.4"
-      sources."mime-db-1.24.0"
-      sources."punycode-1.4.1"
-      sources."assert-plus-0.1.5"
-      sources."asn1-0.1.11"
-      sources."ctype-0.5.3"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
       sources."delayed-stream-1.0.0"
-      sources."bluebird-2.11.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
+      sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -26103,15 +27102,58 @@ in
       sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
+      sources."pinkie-2.0.4"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      sources."jsprim-1.3.1"
+      (sources."sshpk-1.10.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.0"
+      sources."tweetnacl-0.14.3"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.0"
+      sources."mime-db-1.25.0"
       sources."uglify-to-browserify-1.0.2"
-      (sources."yargs-3.5.4" // {
+      sources."yargs-3.10.0"
+      sources."camelcase-1.2.1"
+      (sources."cliui-2.1.0" // {
         dependencies = [
           sources."wordwrap-0.0.2"
         ];
       })
-      sources."camelcase-1.2.1"
       sources."decamelize-1.2.0"
       sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.0.4"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.4"
+      sources."asynckit-0.4.0"
+      sources."punycode-1.4.1"
       sources."os-tmpdir-1.0.2"
       sources."rimraf-2.2.8"
       sources."cycle-1.0.3"
@@ -26130,10 +27172,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.6";
+    version = "2.0.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
-      sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -26191,7 +27233,7 @@ in
       sources."bluebird-3.3.5"
       sources."blueimp-md5-2.3.1"
       sources."body-parser-1.15.2"
-      sources."color-0.11.3"
+      sources."color-0.11.4"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
       sources."diff2html-1.2.0"
@@ -26210,7 +27252,7 @@ in
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
       sources."keen.io-0.1.3"
-      sources."knockout-3.4.0"
+      sources."knockout-3.4.1"
       sources."lodash-4.12.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -26238,11 +27280,11 @@ in
       })
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
-          sources."request-2.76.0"
+          sources."request-2.79.0"
           sources."retry-0.8.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-2.1.1"
+          sources."form-data-2.1.2"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
@@ -26313,23 +27355,23 @@ in
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.0"
+      sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.13"
       sources."on-finished-2.3.0"
       sources."qs-6.2.0"
       sources."raw-body-2.1.7"
-      sources."type-is-1.6.13"
+      sources."type-is-1.6.14"
       sources."ms-0.7.1"
-      sources."inherits-2.0.1"
-      sources."setprototypeof-1.0.1"
-      sources."statuses-1.3.0"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.2"
+      sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.12"
-      sources."mime-db-1.24.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."clone-1.0.2"
-      sources."color-convert-1.5.0"
+      sources."color-convert-1.8.2"
       sources."color-string-0.3.0"
       sources."color-name-1.1.1"
       sources."cookie-0.3.1"
@@ -26440,8 +27482,8 @@ in
       })
       sources."extract-opts-3.3.1"
       sources."eachr-3.2.0"
-      sources."editions-1.3.1"
-      sources."typechecker-4.3.0"
+      sources."editions-1.3.3"
+      sources."typechecker-4.4.0"
       sources."underscore-1.5.2"
       sources."abbrev-1.0.9"
       sources."ansicolors-0.3.2"
@@ -26463,7 +27505,7 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -26526,7 +27568,7 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."validate-npm-package-name-2.2.2"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.1.4"
       sources."ansi-regex-2.0.0"
@@ -26657,6 +27699,7 @@ in
         ];
       })
       sources."typedarray-0.0.6"
+      sources."uuid-3.0.0"
       sources."asynckit-0.4.0"
       sources."punycode-1.4.1"
       sources."passport-strategy-1.0.0"
@@ -26768,7 +27811,7 @@ in
       sources."is-utf8-0.2.1"
       sources."read-pkg-1.1.0"
       sources."path-type-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
     ];
@@ -26798,7 +27841,7 @@ in
           sources."kew-0.7.0"
         ];
       })
-      sources."tmp-0.0.29"
+      sources."tmp-0.0.30"
       sources."follow-redirects-0.0.3"
       (sources."config-chain-1.1.11" // {
         dependencies = [
@@ -26824,7 +27867,7 @@ in
       sources."progress-1.1.8"
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
-      sources."which-1.2.11"
+      sources."which-1.2.12"
       sources."concat-stream-1.5.0"
       sources."debug-0.7.4"
       sources."yauzl-2.4.1"
@@ -26838,7 +27881,7 @@ in
       sources."minimist-0.0.8"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -26859,7 +27902,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -26874,8 +27917,8 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.2"
-      sources."lodash-4.16.4"
-      sources."mime-db-1.24.0"
+      sources."lodash-4.17.2"
+      sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
       (sources."sshpk-1.10.1" // {
@@ -26980,18 +28023,18 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."json5-0.5.0"
       sources."object-assign-4.1.0"
       sources."errno-0.1.4"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
       sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
@@ -27069,7 +28112,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.14"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -27108,25 +28151,26 @@ in
       sources."nan-2.4.0"
       sources."node-pre-gyp-0.6.31"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.0"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.76.0"
+      sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
+          sources."readable-stream-2.1.5"
         ];
       })
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
@@ -27136,7 +28180,7 @@ in
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
-      sources."code-point-at-1.0.1"
+      sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.0.0"
@@ -27149,20 +28193,20 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.1"
+      sources."form-data-2.1.2"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.12"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       (sources."chalk-1.1.3" // {
@@ -27213,7 +28257,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.24.0"
+      sources."mime-db-1.25.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -27226,7 +28270,7 @@ in
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
       sources."source-list-map-0.1.6"
-      sources."amdefine-1.0.0"
+      sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 544db9e0d78b..feeb94a5c462 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,32 +1,39 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
 
-let version = "0.1.2"; in
+buildOcaml rec {
+  name = "asn1-combinators";
+  version = "0.1.3";
 
-stdenv.mkDerivation {
-  name = "ocaml-asn1-combinators-${version}";
+  minimumSupportedOcamlVersion = "4.01";
 
-  src = fetchzip {
-    url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz";
-    sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5";
+  src = fetchFromGitHub {
+    owner  = "mirleft";
+    repo   = "ocaml-asn1-combinators";
+    rev    = "v${version}";
+    sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
   };
 
-  buildInputs = [ ocaml findlib ounit ];
-  propagatedBuildInputs = [ cstruct zarith ];
+  buildInputs = [ ocaml findlib ounit topkg opam ];
+  propagatedBuildInputs = [ result cstruct zarith ];
 
   createFindlibDestdir = true;
 
-  configureFlags = "--enable-tests";
+  buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out | sh
+    ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib
+  '';
+
   doCheck = true;
-  checkTarget = "test";
+  checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
 
   meta = {
     homepage = https://github.com/mirleft/ocaml-asn1-combinators;
     description = "Combinators for expressing ASN.1 grammars in OCaml";
-    platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.bsd2;
+    license = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
-    broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13
   };
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index dd6cffb979c5..8c1aac4d83b2 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools
-, async_p4 ? null, lwt ? null, camlp4
+{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools
+, async ? null, lwt ? null
 }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.01";
@@ -22,10 +22,10 @@ stdenv.mkDerivation {
     inherit (param) sha256;
   };
 
-  configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ];
+  configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
 
-  buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ];
-  propagatedBuildInputs = [ ocplib-endian sexplib_p4 ];
+  buildInputs = [ ocaml findlib ppx_tools lwt async ];
+  propagatedBuildInputs = [ ocplib-endian sexplib ];
 
   createFindlibDestdir = true;
   dontStrip = true;
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
new file mode 100644
index 000000000000..a7290c8bb98f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }:
+
+buildOcaml rec {
+  version = "0.3";
+  name = "erm_xmpp";
+
+  src = fetchFromGitHub {
+    owner  = "hannesm";
+    repo   = "xmpp";
+    rev    = "eee18bd3dd343550169969c0b45548eafd51cfe1";
+    sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ erm_xml nocrypto ];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/hannesm/xmpp;
+    description = "OCaml based XMPP implementation (fork)";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 839a49615cd8..9592e9a68d81 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20160526" then "1i6yqxhs29n6qcvi6c5qbg5mh8752ywsyv1dr6x1qcv0ncqpxhns"
+  else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"
   else throw ("menhir: unknown version " ++ version);
 in
 
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index fab048a9a9f8..d7f7ae0e3655 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
+, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib
+, lwt ? null}:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01";
+with stdenv.lib;
+let withLwt = lwt != null; in
 
-stdenv.mkDerivation rec {
-  name = "ocaml-nocrypto-${version}";
-  version = "0.5.1";
+buildOcaml rec {
+  name = "nocrypto";
+  version = "0.5.3";
 
-  src = fetchzip {
-    url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz";
-    sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0";
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner  = "mirleft";
+    repo   = "ocaml-nocrypto";
+    rev    = "v${version}";
+    sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl";
   };
 
-  buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ];
-  propagatedBuildInputs = [ cstruct zarith ];
+  buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
+  propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
+
+  configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"];
+
+  configurePhase = "./configure --prefix $out $configureFlags";
 
-  configureFlags = "--enable-tests";
   doCheck = true;
   checkTarget = "test";
   createFindlibDestdir = true;
@@ -22,7 +32,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://github.com/mirleft/ocaml-nocrypto;
     description = "Simplest possible crypto to support TLS";
-    platforms = ocaml.meta.platforms or [];
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
new file mode 100644
index 000000000000..3178789c3993
--- /dev/null
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, buildOcaml, fetchFromGitHub, findlib
+, result, uucp, uuseg, uutf
+, lwt     ? null }:
+
+with stdenv.lib;
+
+let withLwt = lwt != null; in
+
+buildOcaml rec {
+  version = "0.1.1";
+  name = "notty";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner  = "pqwy";
+    repo   = "notty";
+    rev    = "v${version}";
+    sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01";
+  };
+
+  buildInputs = [ findlib ];
+  propagatedBuildInputs = [ result uucp uuseg uutf ] ++
+                          optional withLwt [ lwt ];
+
+  configureFlags = [ "--enable-unix" ] ++
+                   (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]);
+
+  configurePhase = "./configure --prefix $out $configureFlags";
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Declarative terminal graphics for OCaml";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
new file mode 100644
index 000000000000..dfee365cd750
--- /dev/null
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -0,0 +1,43 @@
+{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam,
+ ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}:
+
+let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
+
+buildOcaml rec {
+  name = "otr";
+  version = "0.3.3";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner  = "hannesm";
+    repo   = "ocaml-otr";
+    rev    = "${version}";
+    sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr";
+  };
+
+  buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ];
+  propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ];
+
+  buildPhase = ''
+    ocaml ${ocamlFlags} pkg/pkg.ml build \
+      --tests true
+  '';
+
+  installPhase = ''
+    opam-installer --prefix=$out --script | sh
+    ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib
+  '';
+
+  doCheck = true;
+  checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test";
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hannesm/ocaml-otr;
+    description = "Off-the-record messaging protocol, purely in OCaml";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
new file mode 100644
index 000000000000..b38138c55731
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis
+, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit
+, lwt     ? null}:
+
+with stdenv.lib;
+
+let withLwt = lwt != null; in
+
+buildOcaml rec {
+  version = "0.7.1";
+  name = "tls";
+
+  minimunSupportedOcamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner  = "mirleft";
+    repo   = "ocaml-tls";
+    rev    = "${version}";
+    sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24";
+  };
+
+  buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ];
+  propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++
+                          optional withLwt lwt;
+
+  configureFlags = [ "--disable-mirage" "--enable-tests" ] ++
+                   optional withLwt ["--enable-lwt"];
+
+  configurePhase = "./configure --prefix $out $configureFlags";
+
+  doCheck = true;
+  checkTarget = "test";
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirleft/ocaml-tls;
+    description = "TLS in pure OCaml";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index c44ccb18982a..ab82f6abdcbb 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }:
+{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}:
 
-let version = "0.5.0"; in
+buildOcaml rec {
+  name = "x509";
+  version = "0.5.3";
 
-stdenv.mkDerivation {
-  name = "ocaml-x509-${version}";
+  mininimumSupportedOcamlVersion = "4.02";
 
-  src = fetchzip {
-    url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz";
-    sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn";
+  src = fetchFromGitHub {
+    owner  = "mirleft";
+    repo   = "ocaml-x509";
+    rev    = "${version}";
+    sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7";
   };
 
-  buildInputs = [ ocaml findlib ounit ];
+  buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
   propagatedBuildInputs = [ asn1-combinators nocrypto ];
 
   configureFlags = "--enable-tests";
+  configurePhase = "./configure --prefix $out $configureFlags";
+
   doCheck = true;
   checkTarget = "test";
   createFindlibDestdir = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/mirleft/ocaml-x509;
     description = "X509 (RFC5280) handling in OCaml";
-    platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index dfddd7dddbdb..33bb1d5a4cab 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -10,6 +10,8 @@ mkPythonDerivation rec {
     sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [ pkgconfig glib gobjectIntrospection ]
                  ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 21cc80ea6bae..acd04ee3bf5a 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy
+, libmsgpack, qt48, libsodium, snappy, libossp_uuid
 }@args:
 
 let
@@ -202,6 +202,10 @@ in
         --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
     '';
   };
+  
+  uuid4r = attrs: {
+    buildInputs = [ which libossp_uuid ];
+  };
 
   xapian-ruby = attrs: {
     # use the system xapian
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index b481c1e80e5d..91037588552c 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.18";
+  version = "6.19";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m";
+    sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
new file mode 100644
index 000000000000..c8e667722c50
--- /dev/null
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, binutils, fetchgit }:
+
+stdenv.mkDerivation rec {
+  version = "2016.11.16";
+  name = "bloaty-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/google/bloaty.git";
+    rev = "d040e4821ace478f9b43360acd6801aefdd323f7";
+    sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k";
+    fetchSubmodules = true;
+  };
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc
+  '';
+
+  installPhase = ''
+    install -Dm755 {.,$out/bin}/bloaty
+  '';
+
+  meta = with stdenv.lib; {
+    description = "a size profiler for binaries";
+    homepage = https://github.com/google/bloaty;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.dtzWill ];
+  };
+}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 01d1c97ba968..6a752d08cff0 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.13";
+  version = "2.33";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p";
+    sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 4a7d1bf87e31..37517f306e82 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,15 +2,26 @@
 
 buildGoPackage rec {
   name = "doctl-${version}";
-  version = "1.3.1";
-  rev = "a57555c195d06bc7aa5037af77fde0665ad1231f";
+  version = "${major}.${minor}.${patch}";
+  major = "1";
+  minor = "5";
+  patch = "0";
   goPackagePath = "github.com/digitalocean/doctl";
 
+  excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
+  buildFlagsArray = let t = "${goPackagePath}"; in ''
+     -ldflags=
+        -X ${t}.Major=${major}
+        -X ${t}.Minor=${minor}
+        -X ${t}.Patch=${patch}
+        -X ${t}.Label=release
+   '';
+
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "doctl";
-    rev = "${rev}";
-    sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma";
+    rev = "v${version}";
+    sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2";
   };
 
   meta = {
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index ddb136ed86ea..837da4a09dc9 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
     description = "Print where symbols are defined in Go source code";
     homepage = "https://github.com/rogpeppe/godef/";
     maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    licence = stdenv.lib.licenses.bsd3;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/development/tools/jsduck/Gemfile
new file mode 100644
index 000000000000..483fc40ff799
--- /dev/null
+++ b/pkgs/development/tools/jsduck/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "jsduck"
diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock
new file mode 100644
index 000000000000..d3e1556a7b39
--- /dev/null
+++ b/pkgs/development/tools/jsduck/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    dimensions (1.2.0)
+    jsduck (5.3.4)
+      dimensions (~> 1.2.0)
+      json (~> 1.8.0)
+      parallel (~> 0.7.1)
+      rdiscount (~> 2.1.6)
+      rkelly-remix (~> 0.0.4)
+    json (1.8.3)
+    parallel (0.7.1)
+    rdiscount (2.1.8)
+    rkelly-remix (0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jsduck
+
+BUNDLED WITH
+   1.13.6
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
new file mode 100644
index 000000000000..ef89517966d7
--- /dev/null
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, bundlerEnv, makeWrapper, }:
+
+stdenv.mkDerivation rec {
+  pname = "jsduck";
+  name = "${pname}-${version}";
+  version = "5.3.4";
+
+  env = bundlerEnv {
+    name = "${pname}";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ env makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/jsduck $out/bin/jsduck
+  '';
+
+  meta = with lib; {
+    description = "Simple JavaScript Duckumentation generator.";
+    homepage    = https://github.com/senchalabs/jsduck;
+    license     = with licenses; gpl3;
+    maintainers = with stdenv.lib.maintainers; [ periklis ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix
new file mode 100644
index 000000000000..d80bd70dd728
--- /dev/null
+++ b/pkgs/development/tools/jsduck/gemset.nix
@@ -0,0 +1,51 @@
+{
+  dimensions = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  jsduck = {
+    dependencies = ["dimensions" "json" "parallel" "rdiscount" "rkelly-remix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr";
+      type = "gem";
+    };
+    version = "5.3.4";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  rdiscount = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
+      type = "gem";
+    };
+    version = "2.1.8";
+  };
+  rkelly-remix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j";
+      type = "gem";
+    };
+    version = "0.0.7";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index d4a2f80599f7..6386d3176a92 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     description = "A set of utilities to handle ELF objects";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3;
-    maintainers = lib.maintainers.eelco;
+    maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 9059d4ba718a..d88a06c64048 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -4,13 +4,13 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "tokei-${version}";
-  version = "3.0.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz";
-    sha256 = "0xymz52gpasihzhxglzx4wh0312zkraxy4yrpxz694zalf2s5vj5";
+    sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68";
   };
 
-  depsSha256 = "1syx8qzjn357dk2bf4ndmgc4zvrglmw88qiw117h6s511qyz8z0z";
+  depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3";
 
   installPhase = ''
     mkdir -p $out/bin
@@ -23,6 +23,5 @@ buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ gebner ];
     platforms = platforms.all;
-    broken = true;
   };
 }
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index a4c61a58b899..57c57969a88b 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "uncrustify";
-  version = "0.63";
+  version = "0.64";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz";
-    sha256 = "1qravjzmips3m7asbsd0qllmprrl1rshjlmnfq68w84d38sb3yyz";
+  src = fetchFromGitHub {
+    owner = product;
+    repo = product;
+    rev = name;
+    sha256 = "0gvgv44aqrh7cmj4ji8dpbhp47cklvajlc3s9d9z24x96dhp2v97";
   };
 
+  nativeBuildInputs = [ cmake ];
+
   meta = with stdenv.lib; {
     description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
     homepage = http://uncrustify.sourceforge.net/;
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 07cc55465d10..51f4de8eacce 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4, flex, bison, docutils }:
 
 stdenv.mkDerivation rec {
-  name = "xxdiff-4.0";
+  name = "xxdiff-4.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/xxdiff/${name}.tar.bz2";
-    sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i";
+    sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z";
   };
 
   nativeBuildInputs = [ flex bison qt4 docutils ];
@@ -18,12 +18,11 @@ stdenv.mkDerivation rec {
 
   installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
 
-  meta = {
-    homepage = "http://furius.ca/xxdiff/";
+  meta = with stdenv.lib; {
+    homepage = http://furius.ca/xxdiff/;
     description = "Graphical file and directories comparator and merge tool";
-    license = stdenv.lib.licenses.gpl2;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 3c99c3b9580b..2aa2321ef6ac 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -8,10 +8,10 @@ let
   then
     "2.3.1"
   else
-    "2.5.1";
+    "2.5.2";
   hashes = {
     "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
-    "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
+    "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
   };
 in
 
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix
index 7cfb39ebdedc..6f0eb3735ffb 100644
--- a/pkgs/development/tools/parsing/jikespg/default.nix
+++ b/pkgs/development/tools/parsing/jikespg/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "jikespg-1.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/jikes/jikespg-1.3.tar.gz;
-    md5 = "eba183713d9ae61a887211be80eeb21f";
+    url = "mirror://sourceforge/jikes/${name}.tar.gz";
+    sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw";
   };
 
   sourceRoot = "jikespg/src";
@@ -16,9 +16,11 @@ stdenv.mkDerivation {
       cp jikespg $out/bin
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://jikes.sourceforge.net/;
     description = "The Jikes Parser Generator";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.ipl10;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 753c91aa6880..e54d4c540fe2 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "ragel-${version}";
-  version = "7.0.0.6";
+  version = "7.0.0.9";
 
   src = fetchurl {
     url = "http://www.colm.net/files/ragel/${name}.tar.gz";
-    sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs";
+    sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
   };
 
   buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index a53cb4bc0bd0..534f358e5319 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.10";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk";
+    sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz";
   };
 
   unpackPhase = "tar xvzf $src";
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 420f2b0412f0..544f438cf86a 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,19 +10,12 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "7.0.0";
+    version = "7.1.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71";
+      sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm";
     };
 
-    patches = nodejs.patches ++ [
-      (fetchpatch {
-        url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
-        sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
-      })
-    ];
-
   })