From 40d9ebd969f9dceb32375e88f17c1c2cb161d49a Mon Sep 17 00:00:00 2001
From: Unknown <zraexy@gmail.com>
Date: Sat, 7 Oct 2017 15:06:13 -0800
Subject: [PATCH 01/97] massif-visualizer: 0.4.0 -> 0.7.0

---
 .../analysis/massif-visualizer/default.nix    | 26 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index f3195a23f88..99958a416c3 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs4, kgraphviewer }:
+{
+  mkDerivation, lib, fetchurl,
+  extra-cmake-modules, shared_mime_info,
+  qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n,
+  kdiagram, kgraphviewer
+}:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "massif-visualizer-${version}";
-  version = "0.4.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz";
-    sha256 = "0yawzp5lw7ryjcpqkhz70q4hc5hwq5imq5lgqnwgss057zcln7z8";
+    sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q";
   };
 
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-  buildInputs = [ kdelibs4 kgraphviewer ];
+  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
 
-  meta = with stdenv.lib; {
+  buildInputs = [
+    qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n
+    kdiagram kgraphviewer
+  ];
+
+  meta = with lib; {
     description = "Tool that visualizes massif data generated by valgrind";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = with maintainers; [ lethalman zraexy ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 833becfccf9..70ac51d3467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7347,7 +7347,7 @@ with pkgs;
 
   lttv = callPackage ../development/tools/misc/lttv { };
 
-  massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { };
+  massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
 
   maven = maven3;
   maven3 = callPackage ../development/tools/build-managers/apache-maven { };

From e53785ad95b16310b1031897a674648464fe795b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 16 Oct 2017 23:00:35 -0400
Subject: [PATCH 02/97] proot: static by default

---
 pkgs/tools/system/proot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 640750b4f2d..16ee4fccce8 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch
 , talloc, docutils
-, enableStatic ? false }:
+, enableStatic ? true }:
 
 stdenv.mkDerivation rec {
   name = "proot-${version}";

From 10cc95e154d32c096155649d54f6774dee50889e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Oct 2017 18:54:16 -0400
Subject: [PATCH 03/97] proot: 5.1.0 -> 5.1.0.20171015

---
 pkgs/tools/system/proot/default.nix | 32 +++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 16ee4fccce8..8cf7f81381f 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -2,13 +2,12 @@
 , talloc, docutils
 , enableStatic ? true }:
 
-stdenv.mkDerivation rec {
+({ version, rev, sha256, patches }: stdenv.mkDerivation {
   name = "proot-${version}";
-  version = "5.1.0";
+  inherit version;
 
   src = fetchFromGitHub {
-    sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz";
-    rev = "v${version}";
+    inherit rev sha256;
     repo = "proot";
     owner = "cedric-vincent";
   };
@@ -18,12 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [
-    (fetchpatch { # debian patch for aarch64 build
-      sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv";
-      url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch";
-    })
-  ];
+  inherit patches;
 
   preBuild = stdenv.lib.optionalString enableStatic ''
     export LDFLAGS="-static"
@@ -48,4 +42,20 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ ianwookim nckx makefu ];
   };
-}
+})
+(if stdenv.isAarch64 then rec {
+  version = "5.1.0";
+  sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz";
+  rev = "v${version}";
+  patches = [
+    (fetchpatch { # debian patch for aarch64 build
+      sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv";
+      url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch";
+    })
+  ];
+} else {
+  version = "5.1.0.20171015";
+  sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif";
+  rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a";
+  patches = [];
+})

From 0f0d11074f9678a4e0160352ce3e8b49ad9f446f Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 20 Oct 2017 20:24:34 -0400
Subject: [PATCH 04/97] webkitgtk 2.4: fixup build by using older icu again

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d70d61113b..8a4db99090a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8613,6 +8613,9 @@ with pkgs;
     withIcu = true;
     withGraphite2 = true;
   };
+  harfbuzz-icu-58 = harfbuzz-icu.override {
+    icu = icu58;
+  };
 
   hawknl = callPackage ../development/libraries/hawknl { };
 
@@ -10929,7 +10932,7 @@ with pkgs;
   webkitgtk = webkitgtk216x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
-    harfbuzz = harfbuzz-icu;
+    harfbuzz = harfbuzz-icu-58;
     gst-plugins-base = gst_all_1.gst-plugins-base;
     inherit (darwin) libobjc;
   };

From c81563771985a19f9c44bca267b66374fba1b11f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 22 Oct 2017 16:05:02 +0100
Subject: [PATCH 05/97] irssi: 1.0.4 -> 1.0.5

Security update, see https://irssi.org/security/irssi_sa_2017_10.txt.
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index a2ad7e4d7b2..75c4f9ac5c9 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.4";
+  version = "1.0.5";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8";
+    sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From c1105ad9b4b0e2c3e048e3cbed5b2bad4c7eefbb Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Sun, 22 Oct 2017 11:46:33 -0400
Subject: [PATCH 06/97] keepassx-community: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 5de202f8f73..0444b1d96d2 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94";
+    sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn";
   };
 
   cmakeFlags = [ 

From 460c3f425e865414207de75eebf34ba80cca5b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Sun, 22 Oct 2017 18:36:16 +0200
Subject: [PATCH 07/97] calibre: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6569c892057..ab106f6dcd9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.9.0";
+  version = "3.10.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0zsf1czw8bz41nk9f55vxwncf0chxdflyhjj2khw9da67ph6yknx";
+    sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais";
   };
 
   patches = [

From 28494e96f0193f888d294b185f2432a59e07fb91 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Oct 2017 21:00:23 +0300
Subject: [PATCH 08/97] falkon: Disable parallel building

https://hydra.nixos.org/build/62778325
---
 pkgs/applications/networking/browsers/falkon/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index 715fefe17d8..b2067effb96 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
 
-  enableParallelBuilding = true;
+  # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm'
+  enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
     description = "QtWebEngine based cross-platform web browser";

From c529454c60c3d053b950e941f515eb0f74cc7a48 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Oct 2017 14:35:32 -0400
Subject: [PATCH 09/97] linux: 4.9.57 -> 4.9.58

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 8a1ad7ca9dd..e1f3fe63ea0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.57";
+  version = "4.9.58";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19lndirbyryx0qdwqqhn1g4rng7d79rk4sra5lpa2d3axia0a8q9";
+    sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl";
   };
 } // (args.argsOverride or {}))

From 69ebd73571b4fb959381712519e33a067db2f2ea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Oct 2017 14:35:49 -0400
Subject: [PATCH 10/97] linux: 4.13.8 -> 4.13.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix
index ee1aa79f540..77d137f9453 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13.8";
+  version = "4.13.9";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "09zl4gpw9j4xn6p78s6ba6qjjxpsy8whhvn19wnjhr9w4al8rrk4";
+    sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51";
   };
 } // (args.argsOverride or {}))

From e9aa686d3b5932ef957f66c0a74e87d7ae51e50a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Oct 2017 14:41:01 -0400
Subject: [PATCH 11/97] linux-copperhead: 4.13.8.a -> 4.13.9.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 0c9c05312ba..a93e4a96119 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.13.8";
+  version = "4.13.9";
   revision = "a";
-  sha256 = "1yjam6ni32f9p7c1x2q12vi9fc9v10g1w35pr4p7qgs12zx8dy27";
+  sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 917bd0bfbc52f548e306fd4adf8e8459cd5203ea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Oct 2017 21:57:59 +0300
Subject: [PATCH 12/97] souffle: Disable parallel building

https://hydra.nixos.org/build/62750790
---
 pkgs/development/compilers/souffle/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 217b2aecd33..c56ea8cc649 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./bootstrap";
 
-  enableParallelBuilding = true;
+  # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef
+  enableParallelBuilding = false;
 
   # See https://github.com/souffle-lang/souffle/issues/176
   hardeningDisable = [ "fortify" ];

From ba4cefe4ae70cfb9121281f508ed5d9fa9dbc662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= <r.dee.b.b@gmail.com>
Date: Sun, 8 Oct 2017 21:42:22 +0200
Subject: [PATCH 13/97] aspell: added new patch
 data-dirs-from-nix-profiles.patch

Aspell will search for dictionaries in all nix profiles even when used as library.
Setting data-dir or dict-dir in ASPELL_CONF will disable this behavior.
---
 .../libraries/aspell/aspell-with-dicts.nix    |  4 ++
 .../aspell/data-dirs-from-nix-profiles.patch  | 38 +++++++++++++++++++
 pkgs/development/libraries/aspell/default.nix | 27 ++-----------
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch

diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
index 0739ad333df..fd5ccf9696c 100644
--- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix
+++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
@@ -1,5 +1,9 @@
 # Create a derivation that contains aspell and selected dictionaries.
 # Composition is done using `pkgs.buildEnv`.
+# Beware of that `ASPELL_CONF` used by this derivation is not always
+# respected by libaspell (#28815) and in some cases, when used as
+# dependency by another derivation, the passed dictionaries will be
+# missing. However, invoking aspell directly should be fine.
 
 { aspell
 , aspellDicts
diff --git a/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch b/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch
new file mode 100644
index 00000000000..c19827ba93e
--- /dev/null
+++ b/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch
@@ -0,0 +1,38 @@
+diff --git a/common/info.cpp b/common/info.cpp
+index 8291cc7..6216326 100644
+--- a/common/info.cpp
++++ b/common/info.cpp
+@@ -36,6 +36,7 @@
+ #include "strtonum.hpp"
+ #include "lock.hpp"
+ #include "string_map.hpp"
++#include "file_util.hpp"
+ 
+ #include "gettext.h"
+ 
+@@ -495,6 +496,25 @@ namespace acommon {
+     lst.clear();
+     lst.add(config->retrieve("data-dir"));
+     lst.add(config->retrieve("dict-dir"));
++    if (config->lookup("data-dir") == NULL && config->lookup("dict-dir") == NULL) {
++        const char* cprofiles = getenv("NIX_PROFILES");
++        if (cprofiles != NULL) {
++            char* profiles = strdup(cprofiles);
++            char* profile = profiles;
++            char* end = profile;
++            while (*end != '\0') {
++                if (*end == ' ') {
++                    *end = '\0';
++                    lst.add(add_possible_dir(profile, "lib/aspell"));
++                    profile = ++end;
++                } else {
++                    ++end;
++                }
++            }
++            lst.add(add_possible_dir(profile, "lib/aspell"));
++            free(profiles);
++        }
++    }
+   }
+ 
+   DictExt::DictExt(ModuleInfo * m, const char * e)
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index e69bbe0d2f2..0f6f5e8dd14 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, perl}:
+{stdenv, fetchurl, perl
+, searchNixProfiles ? true}:
 
 stdenv.mkDerivation rec {
   name = "aspell-0.60.6.1";
@@ -10,6 +11,8 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     patch interfaces/cc/aspell.h < ${./clang.patch}
+  '' + stdenv.lib.optionalString searchNixProfiles ''
+    patch -p1 < ${./data-dirs-from-nix-profiles.patch}
   '';
 
   buildInputs = [ perl ];
@@ -23,28 +26,6 @@ stdenv.mkDerivation rec {
     );
   '';
 
-  postInstall = ''
-    local prog="$out/bin/aspell"
-    local hidden="$out/bin/.aspell-wrapped"
-    mv "$prog" "$hidden"
-    cat > "$prog" <<END
-    #! $SHELL -e
-    if [ -z "\$ASPELL_CONF" ]; then
-      for p in \$NIX_PROFILES; do
-        if [ -d "\$p/lib/aspell" ]; then
-          ASPELL_CONF="data-dir \$p/lib/aspell"
-        fi
-      done
-      if [ -z "\$ASPELL_CONF" ] && [ -d "\$HOME/.nix-profile/lib/aspell" ]; then
-        ASPELL_CONF="data-dir \$HOME/.nix-profile/lib/aspell"
-      fi
-      export ASPELL_CONF
-    fi
-    exec "$hidden" "\$@"
-    END
-    chmod +x "$prog"
-  '';
-
   meta = {
     description = "Spell checker for many languages";
     homepage = http://aspell.net/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfacf209926..ab200447495 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7769,7 +7769,9 @@ with pkgs;
 
   aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
 
-  aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { };
+  aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix {
+    aspell = aspell.override { searchNixProfiles = false; };
+  };
 
   attica = callPackage ../development/libraries/attica { };
 

From 89720d851aafe7be2aafc129fd729941a4db18af Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 20 Oct 2017 16:29:00 -0700
Subject: [PATCH 14/97] coqPackages_8_7: New expression, but don't make it the
 default yet

---
 pkgs/applications/science/logic/coq/default.nix      | 1 +
 pkgs/development/coq-modules/QuickChick/default.nix  | 6 ++++++
 pkgs/development/coq-modules/coq-ext-lib/default.nix | 1 +
 pkgs/development/coq-modules/coquelicot/default.nix  | 1 +
 pkgs/development/coq-modules/dpdgraph/default.nix    | 5 +++++
 pkgs/top-level/all-packages.nix                      | 3 ++-
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index ded8749f10d..cdfd035c713 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -20,6 +20,7 @@ let
    "8.6"       = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
    "8.6.1"     = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
    "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b";
+   "8.7.0"     = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 1ce559b325e..688182f4e5e 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -19,6 +19,12 @@ let param =
       rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
       sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
     };
+
+    "8.7" = {
+      version = "20170616";
+      rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
+      sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
+    };
   }."${coq.coq-version}"
 ; in
 
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index ed9312b5c57..5ebf0792277 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -5,6 +5,7 @@ let param =
     "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; };
     "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
     "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
+    "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
   }."${coq.coq-version}";
 in
 
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 6f58c387586..84f95d4ddea 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -16,6 +16,7 @@ let param =
   "8.4" = v2_1_1;
   "8.5" = v3_0_1;
   "8.6" = v3_0_1;
+  "8.7" = v3_0_1;
 }."${coq.coq-version}"; in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 65be1f4e066..aec3828f323 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
 
 let param = {
+  "8.7" = {
+    version = "0.6.1";
+    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
+    sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
+  };
   "8.6" = {
     version = "0.6.1";
     rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb50c82969..e9245531d19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18544,7 +18544,7 @@ with pkgs;
   };
   coq_8_6 = callPackage ../applications/science/logic/coq {};
   coq_8_7 = callPackage ../applications/science/logic/coq {
-    version = "8.7+beta2";
+    version = "8.7.0";
   };
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
 
@@ -18604,6 +18604,7 @@ with pkgs;
   coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4;
   coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5;
   coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6;
+  coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7;
   coqPackages = coqPackages_8_6;
   coq = coqPackages.coq;
 

From 4ace0daa21c69b80ff896b497c55ba0db06eace8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Oct 2017 20:48:18 +0000
Subject: [PATCH 15/97] =?UTF-8?q?coqPackages.fiat=5FHEAD:=20mark=20as=20br?=
 =?UTF-8?q?oken=20with=20Coq=20=E2=89=A5=208.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/coq-modules/fiat/HEAD.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index fe9f3307b7a..dc411763da5 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
+    broken = stdenv.lib.versionAtLeast coq.coq-version "8.6";
   };
 
 }

From 5711bfdefb6daa5185d690d9cf7133a3fae61c95 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 22 Oct 2017 21:09:19 +0100
Subject: [PATCH 16/97] torcs: fix build with gcc6

---
 pkgs/games/torcs/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 1ea94a5d2ce..e7c1c38fd15 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
+{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
 libpng, zlib, bash, makeWrapper }:
 
@@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa";
   };
 
-  patchPhase = ''
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch";
+      sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876";
+    })
+  ];
+
+  postPatch = ''
     sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
   '';
 

From ce0684a81a2596a9a2b4a3072f7cb5ca01961bb7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 22 Oct 2017 21:09:46 +0100
Subject: [PATCH 17/97] torcs: re-enable -Wformat hardening

---
 pkgs/games/torcs/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index e7c1c38fd15..3a4b8bdb021 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch";
       sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876";
     })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch";
+      sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
+    })
   ];
 
   postPatch = ''
@@ -28,8 +32,6 @@ stdenv.mkDerivation rec {
 
   installTargets = "install datainstall";
 
-  hardeningDisable = [ "format" ];
-
   postInstall = ''
     wrapProgram $out/bin/torcs \
       --prefix LD_LIBRARY_PATH : ${mesa}/lib

From a94d014149173c1a2b1c005ed3e22bd86413d643 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 22 Oct 2017 21:10:49 +0100
Subject: [PATCH 18/97] torcs: clean up compiler warnings

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

diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 3a4b8bdb021..1b6ad5b34c3 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch";
       sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
     })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch";
+      sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp";
+    })
   ];
 
   postPatch = ''

From 4068703502cb2948d09bc419d19e25b1e18502e2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 23 Oct 2017 00:30:10 +0300
Subject: [PATCH 19/97] x42-plugins: Hack to attempt fixing the perpetual build
 problem

Since basically forever, it randomly fails with
   do not know how to unpack source archive /nix/store/d821jkm8bgkdcv924nk7qr1q06l9is35-x42-plugins-20170428.tar.xz
on Hydra.

https://hydra.nixos.org/build/62793688
---
 pkgs/applications/audio/x42-plugins/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 2b509d8db60..0c151697e89 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -12,7 +12,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat  zita-convolver];
+  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
+
+  # Don't remove this. The default fails with 'do not know how to unpack source archive'
+  # every now and then on Hydra. No idea why.
+  unpackPhase = ''
+    tar xf $src
+    sourceRoot=$(echo x42-plugins-*)
+    chmod -R u+w $sourceRoot
+  '';
 
   makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
 

From fe41e1763153583fc956876872d27da9e017db41 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Oct 2017 22:14:38 +0000
Subject: [PATCH 20/97] ocamlPackages.merlin: fix homepage URL

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

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 3d5a13c7e0c..904e070e511 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "An editor-independent tool to ease the development of programs in OCaml";
-    homepage = http://the-lambda-church.github.io/merlin/;
+    homepage = "https://github.com/ocaml/merlin";
     license = licenses.mit;
     maintainers = [ maintainers.vbgl ];
   };

From 97d02a78f049dc3287089b11b00d560f3253a554 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Oct 2017 22:19:28 +0000
Subject: [PATCH 21/97] 0ad: fix homepage URL

---
 pkgs/games/0ad/data.nix | 2 +-
 pkgs/games/0ad/game.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index f61b8bc1dcf..2c6abd7972f 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare -- data files";
-    homepage = https://wildfiregames.com/0ad/;
+    homepage = "https://play0ad.com/";
     license = licenses.cc-by-sa-30;
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index c1b69eb3120..a056f5880a4 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare";
-    homepage = https://wildfiregames.com/0ad/;
+    homepage = "https://play0ad.com/";
     license = with licenses; [
       gpl2 lgpl21 mit cc-by-sa-30
       licenses.zlib # otherwise masked by pkgs.zlib

From 1d6eaac764120c3498080275091bb6649144abb9 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Oct 2017 17:40:01 +0100
Subject: [PATCH 22/97] rust: remove beta and nightly releases

nixpkgs is for stable software. If you want beta and nightly, use the
nixpkgs-mozilla overlay.
---
 pkgs/development/compilers/rust/beta.nix      | 40 -------------------
 pkgs/development/compilers/rust/nightly.nix   | 37 -----------------
 .../development/compilers/rust/nightlyBin.nix | 23 -----------
 .../patches/disable-lockfile-check-beta.patch | 25 ------------
 .../disable-lockfile-check-nightly.patch      | 25 ------------
 pkgs/top-level/all-packages.nix               | 32 +++------------
 6 files changed, 6 insertions(+), 176 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/beta.nix
 delete mode 100644 pkgs/development/compilers/rust/nightly.nix
 delete mode 100644 pkgs/development/compilers/rust/nightlyBin.nix
 delete mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
 delete mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch

diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
deleted file mode 100644
index 876c54a298b..00000000000
--- a/pkgs/development/compilers/rust/beta.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
-, targets ? []
-, targetToolchains ? []
-, targetPatches ? []
-}:
-
-let
-  rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-in
-rec {
-  rustc = callPackage ./rustc.nix {
-    inherit llvm targets targetPatches targetToolchains rustPlatform;
-
-    version = "beta-2017-05-27";
-
-    configureFlags = [ "--release-channel=beta" ];
-
-    src = fetchurl {
-      url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz";
-      sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57";
-    };
-
-    patches = [
-      ./patches/darwin-disable-fragile-tcp-tests.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-
-    doCheck = false;
-    broken = true;
-  };
-
-  cargo = callPackage ./cargo.nix rec {
-    version = "0.18.0";
-    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
-    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
-    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
-
-    inherit rustc; # the rustc that will be wrapped by cargo
-    inherit rustPlatform; # used to build cargo
-  };
-}
diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix
deleted file mode 100644
index 37a234ea129..00000000000
--- a/pkgs/development/compilers/rust/nightly.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, callPackage, rustPlatform, llvm, fetchurl
-, targets ? []
-, targetToolchains ? []
-, targetPatches ? []
-}:
-
-rec {
-  rustc = callPackage ./rustc.nix {
-    inherit llvm targets targetPatches targetToolchains rustPlatform;
-
-    version = "nightly-2017-05-30";
-
-    configureFlags = [ "--release-channel=nightly" ];
-
-    src = fetchurl {
-      url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz";
-      sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0";
-    };
-
-    patches = [
-      ./patches/darwin-disable-fragile-tcp-tests.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-
-    doCheck = false;
-    broken = true;
-  };
-
-  cargo = callPackage ./cargo.nix rec {
-    version = "0.18.0";
-    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
-    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
-    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
-
-    inherit rustc; # the rustc that will be wrapped by cargo
-    inherit rustPlatform; # used to build cargo
-  };
-}
diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
deleted file mode 100644
index af06835c5de..00000000000
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
-
-let
-  platform = if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else throw "missing bootstrap url for platform ${stdenv.system}";
-
-  bootstrapHash =
-    if stdenv.system == "x86_64-linux"
-    then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf"
-    else throw "missing bootstrap hash for platform ${stdenv.system}";
-
-  src = fetchurl {
-     url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz";
-     sha256 = bootstrapHash;
-  };
-
-  version = "2017-06-26";
-in import ./binaryBuild.nix
-  { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl;
-    inherit version src platform;
-    versionType = "nightly";
-  }
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
deleted file mode 100644
index a6fe3413fd2..00000000000
--- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001
-From: joachim schiele <js@lastlog.de>
-Date: Thu, 24 Nov 2016 22:25:48 +0100
-Subject: [PATCH 2/2] asdf
-
----
- src/tools/tidy/src/main.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
-index cabaee5..685df94 100644
---- a/src/tools/tidy/src/main.rs
-+++ b/src/tools/tidy/src/main.rs
-@@ -48,7 +48,7 @@ fn main() {
-     errors::check(&path, &mut bad);
-     cargo::check(&path, &mut bad);
-     features::check(&path, &mut bad);
--    cargo_lock::check(&path, &mut bad);
-+    //cargo_lock::check(&path, &mut bad);
-     pal::check(&path, &mut bad);
- 
-     if bad {
--- 
-2.10.0
-
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
deleted file mode 100644
index c89d22dcb1e..00000000000
--- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001
-From: joachim schiele <js@lastlog.de>
-Date: Fri, 25 Nov 2016 02:17:02 +0100
-Subject: [PATCH] asdf
-
----
- src/tools/tidy/src/main.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
-index cb11fe2..c9b7d2a 100644
---- a/src/tools/tidy/src/main.rs
-+++ b/src/tools/tidy/src/main.rs
-@@ -45,7 +45,7 @@ fn main() {
-     bins::check(&path, &mut bad);
-     style::check(&path, &mut bad);
-     errors::check(&path, &mut bad);
--    cargo::check(&path, &mut bad);
-+    //cargo::check(&path, &mut bad);
-     features::check(&path, &mut bad);
-     pal::check(&path, &mut bad);
- 
--- 
-2.10.0
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab2d1dd75c0..4ed1c957756 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6175,34 +6175,12 @@ with pkgs;
     inherit (darwin) apple_sdk;
   };
 
+  # For beta and nightly releases use the nixpkgs-mozilla overlay
+  rust = callPackage ../development/compilers/rust { };
+  inherit (rust) cargo rustc;
+
   rustRegistry = callPackage ./rust-packages.nix { };
 
-  rust = rustStable;
-  rustStable = callPackage ../development/compilers/rust {
-    inherit (llvmPackages_4) llvm;
-  };
-  rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
-
-  rustNightly = rustBeta;
-
-  # rust support in nixpkgs isn't yet well maintained enough for us to
-  # pretend to support nightlies in a meaningful way.
-
-  # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
-  #   rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
-  # }));
-
-  rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
-     buildRustPackage = callPackage ../build-support/rust {
-       rust = rustNightlyBin;
-     };
-  });
-
-  cargo = rust.cargo;
-  rustc = rust.rustc;
-
-  cargo-edit = callPackage ../tools/package-management/cargo-edit { };
-
   rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
 
   makeRustPlatform = rust: lib.fix (self:
@@ -6224,6 +6202,8 @@ with pkgs;
 
     });
 
+  cargo-edit = callPackage ../tools/package-management/cargo-edit { };
+
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
   rustracer = callPackage ../development/tools/rust/racer { };

From e30e2010277da6814c6828b199c778774b3ba00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Sat, 7 Oct 2017 00:12:22 +0200
Subject: [PATCH 23/97] rust: unbreak building with bundled LLVM

---
 pkgs/development/compilers/rust/rustc.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 73d78319b8c..6eb160add26 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -48,15 +48,18 @@ stdenv.mkDerivation {
   configureFlags = configureFlags
                 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
                 ++ [ "--enable-vendor" "--disable-locked-deps" ]
-                ++ [ "--enable-llvm-link-shared" ]
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
+                ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
                 ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
                 ++ optional (targets != []) "--target=${target}"
                 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
   patches = patches ++ targetPatches;
 
+  # the rust build system complains that nix alters the checksums
+  dontFixLibtool = true;
+
   passthru.target = target;
 
   postPatch = ''

From 7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Oct 2017 17:41:16 +0100
Subject: [PATCH 24/97] rust: 1.17.0 -> 1.20.0

simplify the boostrap hashes a bit

build with bundled llvm:

the rust project has forked the llvm compiler to solve some
issues.
With pkgs.llvm the test suite fails.

See https://github.com/rust-lang/rust/pull/43026

And PR #30088
---
 pkgs/development/compilers/rust/bootstrap.nix | 30 +++++++---------
 pkgs/development/compilers/rust/cargo.nix     |  4 +--
 pkgs/development/compilers/rust/default.nix   | 13 +++----
 .../compilers/rust/print-hashes.sh            | 34 +++++++++++--------
 4 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index ad49b130570..fbcac09fc45 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -1,6 +1,18 @@
 { stdenv, fetchurl, makeWrapper, cacert, zlib, curl }:
 
 let
+  # Note: the version MUST be one version prior to the version we're
+  # building
+  version = "1.19.0";
+
+  # fetch hashes by running `print-hashes.sh 1.19.0`
+  hashes = {
+    i686-unknown-linux-gnu = "657b78f3c1a1b4412e12f7278e20cc318022fa276a58f0d38a0d15b515e39713";
+    x86_64-unknown-linux-gnu = "30ff67884464d32f6bbbde4387e7557db98868e87fb2afbb77c9b7716e3bff09";
+    i686-apple-darwin = "bdfd2189245dc5764c9f26bdba1429c2bf9d57477d8e6e3f0ba42ea0dc63edeb";
+    x86_64-apple-darwin = "5c668fb60a3ba3e97dc2cb8967fc4bb9422b629155284dcb89f94d116bb17820";
+  };
+
   platform =
     if stdenv.system == "i686-linux"
     then "i686-unknown-linux-gnu"
@@ -12,27 +24,11 @@ let
     then "x86_64-apple-darwin"
     else throw "missing bootstrap url for platform ${stdenv.system}";
 
-  # fetch hashes by patching print-hashes.sh to not use the "$DATE" variable
-  # then running `print-hashes.sh 1.16.0`
-  bootstrapHash =
-    if stdenv.system == "i686-linux"
-    then "b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5"
-    else if stdenv.system == "x86_64-linux"
-    then "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd"
-    else if stdenv.system == "i686-darwin"
-    then "26356b14164354725bd0351e8084f9b164abab134fb05cddb7758af35aad2065"
-    else if stdenv.system == "x86_64-darwin"
-    then "2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926"
-    else throw "missing bootstrap hash for platform ${stdenv.system}";
-
   src = fetchurl {
      url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
-     sha256 = bootstrapHash;
+     sha256 = hashes."${platform}";
   };
 
-  # Note: the version  MUST be one version prior to the version we're
-  # building
-  version = "1.16.0";
 in import ./binaryBuild.nix
   { inherit stdenv fetchurl makeWrapper cacert zlib curl;
     buildRustPackage = null;
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 97977ba3ed3..2df843faf93 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
-, version, srcRev, srcSha, depsSha256
+, version, srcSha, depsSha256
 , patches ? []}:
 
 rustPlatform.buildRustPackage rec {
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo";
-    rev = srcRev;
+    rev = version;
     sha256 = srcSha;
   };
 
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 0d7e26e06f4..2544cca4336 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,17 +6,19 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.17.0";
+  version = "1.20.0";
 in
 rec {
   rustc = callPackage ./rustc.nix {
     inherit llvm targets targetPatches targetToolchains rustPlatform version;
 
+    forceBundledLLVM = true;
+
     configureFlags = [ "--release-channel=stable" ];
 
     src = fetchurl {
       url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-      sha256 = "4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87";
+      sha256 = "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a";
     };
 
     patches = [
@@ -26,10 +28,9 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.18.0";
-    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
-    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
-    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
+    version = "0.21.1";
+    srcSha = "a64iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
+    depsSha256 = "amrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index da52ac37ab3..f3d094d65a8 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # All rust-related downloads can be found at
 # https://static.rust-lang.org/dist/index.html.  To find the date on
@@ -6,25 +7,30 @@
 # file, e.g.
 # https://static.rust-lang.org/dist/channel-rust-beta-date.txt
 
-PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
-BASEURL="https://static.rust-lang.org/dist"
-DATE=$1
-VERSION=$2
+PLATFORMS=(
+  i686-unknown-linux-gnu
+  x86_64-unknown-linux-gnu
+  i686-apple-darwin
+  x86_64-apple-darwin
+)
+BASEURL=https://static.rust-lang.org/dist
+VERSION=${1:-}
+DATE=${2:-}
 
-if [[ -z  $DATE ]]
-then
-    echo "No date supplied"
-    exit -1
-fi
-
-if [[ -z  $VERSION ]]
+if [[ -z $VERSION ]]
 then
     echo "No version supplied"
     exit -1
 fi
 
-for PLATFORM in $PLATFORMS
+if [[ -n $DATE ]]
+then
+    BASEURL=$BASEURL/$DATE
+fi
+
+for PLATFORM in "${PLATFORMS[@]}"
 do
-    URL="$BASEURL/$DATE/rust-$VERSION-$PLATFORM.tar.gz.sha256"
-    curl $URL
+    URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256"
+    SHA256=$(curl -sSfL $URL | cut -d ' ' -f 1)
+    echo "$PLATFORM = \"$SHA256\";"
 done

From d170c2ceadde34a1ee4844fe59d876351331b707 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 8 Oct 2017 19:26:40 +0100
Subject: [PATCH 25/97] cargo: use fetchFromGitHub

---
 pkgs/development/compilers/rust/cargo.nix   | 9 +++++----
 pkgs/development/compilers/rust/default.nix | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2df843faf93..2f1cf07c3b8 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
+{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
 , version, srcSha, depsSha256
 , patches ? []}:
@@ -7,9 +7,10 @@ rustPlatform.buildRustPackage rec {
   name = "cargo-${version}";
   inherit version;
 
-  src = fetchgit {
-    url = "https://github.com/rust-lang/cargo";
-    rev = version;
+  src = fetchFromGitHub {
+    owner  = "rust-lang";
+    repo   = "cargo";
+    rev    = version;
     sha256 = srcSha;
   };
 
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 2544cca4336..122bda0f70b 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -29,8 +29,8 @@ rec {
 
   cargo = callPackage ./cargo.nix rec {
     version = "0.21.1";
-    srcSha = "a64iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
-    depsSha256 = "amrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
+    srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7";
+    depsSha256 = "0pzfn1zjgklr0fw9zi9sxrwr08q3wcvdl9ybxrk3ld7ps5h9wmsi";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo

From 5f8cf0048ea089fa73d17512fc4f9f0f0644e225 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sat, 5 Aug 2017 15:38:48 +0100
Subject: [PATCH 26/97] rust: update cargo builder to fetch registry
 dynamically
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.

Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.

This also uses the new --frozen and --locked flags which is nice.

Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).

This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.

Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
---
 doc/languages-frameworks/rust.md              |  21 +-
 pkgs/applications/altcoins/ethabi.nix         |   2 +-
 pkgs/applications/altcoins/ethrun.nix         |   3 +-
 .../altcoins/zcash/librustzcash/default.nix   |   2 +-
 pkgs/applications/misc/alacritty/default.nix  |   3 +-
 .../networking/cluster/habitat/default.nix    |   3 +-
 .../networking/dyndns/cfdyndns/default.nix    |   2 +-
 .../git-and-tools/git-dit/default.nix         |   2 +-
 .../version-management/pijul/default.nix      |   2 +-
 .../window-managers/way-cooler/default.nix    |   3 +-
 .../window-managers/wtftw/default.nix         |   3 +-
 pkgs/build-support/rust/cargo-vendor.nix      |  32 +++
 pkgs/build-support/rust/default.nix           |  89 ++------
 pkgs/build-support/rust/fetch-cargo-deps      | 209 ------------------
 pkgs/build-support/rust/fetchcargo.nix        |  25 ++-
 pkgs/development/compilers/rust/cargo.nix     |   4 +-
 pkgs/development/compilers/rust/default.nix   |   4 +-
 ...ests-libstd-net-tcp-on-Darwin-Linux.patch} |  31 ++-
 pkgs/development/misc/loc/default.nix         |   8 +-
 pkgs/development/tools/clog-cli/default.nix   |   2 +-
 pkgs/development/tools/git-series/default.nix |  18 +-
 pkgs/development/tools/misc/tokei/default.nix |   3 +-
 pkgs/development/tools/rq/default.nix         |   2 +-
 .../tools/rust/bindgen/default.nix            |   2 +-
 pkgs/development/tools/rust/racer/default.nix |   2 +-
 .../development/tools/rust/racerd/default.nix |   2 +-
 .../tools/rust/rainicorn/default.nix          |   3 +-
 .../tools/rust/rustfmt/default.nix            |   2 +-
 .../development/tools/rust/rustup/default.nix |   2 +-
 pkgs/misc/tw-rs/default.nix                   |   2 +-
 pkgs/shells/ion/default.nix                   |   2 +-
 pkgs/tools/admin/intecture/agent.nix          |   2 +-
 pkgs/tools/admin/intecture/auth.nix           |   2 +-
 pkgs/tools/admin/intecture/cli.nix            |   2 +-
 .../filesystems/btrfs-dedupe/default.nix      |   2 +-
 pkgs/tools/misc/exa/default.nix               |   2 +-
 pkgs/tools/misc/fd/default.nix                |   2 +-
 pkgs/tools/misc/heatseeker/default.nix        |   2 +-
 .../package-management/cargo-edit/default.nix |   3 +-
 .../package-management/nix-index/default.nix  |   2 +-
 pkgs/tools/text/ripgrep/default.nix           |   2 +-
 pkgs/tools/text/staccato/default.nix          |   3 +-
 pkgs/tools/text/xsv/default.nix               |   2 +-
 pkgs/tools/typesetting/tectonic/default.nix   |   2 +-
 pkgs/top-level/aliases.nix                    |   1 -
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/rust-packages.nix              |  46 ----
 47 files changed, 167 insertions(+), 400 deletions(-)
 create mode 100644 pkgs/build-support/rust/cargo-vendor.nix
 delete mode 100755 pkgs/build-support/rust/fetch-cargo-deps
 rename pkgs/development/compilers/rust/patches/{darwin-disable-fragile-tcp-tests.patch => 0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch} (55%)
 delete mode 100644 pkgs/top-level/rust-packages.nix

diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 481b76fb78f..276b5496fbb 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -9,16 +9,15 @@ date: 2017-03-05
 To install the rust compiler and cargo put
 
 ```
-rustStable.rustc
-rustStable.cargo
+rust
 ```
 
-into the `environment.systemPackages` or bring them into scope with
-`nix-shell -p rustStable.rustc -p rustStable.cargo`.
+into the `environment.systemPackages` or bring them into
+scope with `nix-shell -p rust`.
 
-There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regularly. For daily builds use either rustup from
-nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
+For daily builds (beta and nightly) use either rustup from
+nixpkgs or use the [Rust nightlies
+overlay](#using-the-rust-nightlies-overlay).
 
 ## Packaging Rust applications
 
@@ -38,7 +37,7 @@ buildRustPackage rec {
     sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
   };
 
-  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+  cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
@@ -50,7 +49,7 @@ buildRustPackage rec {
 }
 ```
 
-`buildRustPackage` requires a `depsSha256` attribute which is computed over
+`buildRustPackage` requires a `cargoSha256` attribute which is computed over
 all crate sources of this package. Currently it is obtained by inserting a
 fake checksum into the expression and building the package once. The correct
 checksum can be then take from the failed build.
@@ -76,11 +75,11 @@ in the `~/.config/nixpkgs/overlays` directory.
 
 The latest version can be installed with the following command:
 
-    $ nix-env -Ai nixos.rustChannels.stable.rust
+    $ nix-env -Ai nixos.latest.rustChannels.stable.rust
 
 Or using the attribute with nix-shell:
 
-    $ nix-shell -p nixos.rustChannels.stable.rust
+    $ nix-shell -p nixos.latest.rustChannels.stable.rust
 
 To install the beta or nightly channel, "stable" should be substituted by
 "nightly" or "beta", or
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index c584dd65ebb..e8fb1c49828 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
   };
 
-  depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
+  cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy";
 
   cargoBuildFlags = ["--features cli"];
 
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
index f61a5884fd4..2a8c37610db 100644
--- a/pkgs/applications/altcoins/ethrun.nix
+++ b/pkgs/applications/altcoins/ethrun.nix
@@ -13,12 +13,13 @@ buildRustPackage rec {
     sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
   };
 
-  depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq";
+  cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
 
   meta = {
     description = "Directly run Ethereum bytecode";
     homepage = https://github.com/dapphub/ethrun/;
     maintainers = [stdenv.lib.maintainers.dbrock];
+    broken = true; # mark temporary as broken
     inherit version;
   };
 }
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 2b2094c8401..b89582c09e6 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
   };
 
-  depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx";
+  cargoSha256 = "1b0kal53ggcr59hbrsdj8fifjycahrmzwq677n9h3fywv4r237m6";
 
   installPhase = ''
     mkdir -p $out/lib
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 411705e6a6a..77466fba653 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -38,7 +38,7 @@ buildRustPackage rec {
     sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx";
   };
 
-  depsSha256 = "05gkl2zg546i2pm0gx11s56f7dk72qpm39kml1d2myj81s0vyb5z";
+  cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz";
 
   buildInputs = [
     cmake
@@ -69,6 +69,7 @@ buildRustPackage rec {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "GPU-accelerated terminal emulator";
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 60531261140..1656e5a09a6 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
     sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
   };
 
-  depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py";
+  cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0";
 
   buildInputs = [ libsodium libarchive openssl ];
 
@@ -35,5 +35,6 @@ buildRustPackage rec {
     license = licenses.asl20;
     maintainers = [ maintainers.rushmorem ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    broken = true; # mark temporary as broken due git dependencies
   };
 }
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a79404e77c8..d1eeaa48bb7 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -12,7 +12,7 @@ buildRustPackage rec {
     sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
   };
 
-  depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn";
+  cargoSha256 = "0k9d6pxsb4gvkqs00g71c1nnz773iccg4vajgn33qdym6m6qsjwy";
 
   buildInputs = [ makeWrapper openssl ];
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index d68430714de..6fb9f5e36f1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -23,7 +23,7 @@ buildRustPackage rec {
     sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
   };
 
-  depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h";
+  cargoSha256 = "08zbvjwjdpv2sbj6mh73py82inhs18jvmh8m9k4l94fcz6ykgqwr";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index a5479a6c6a8..36c7c3c5885 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   doCheck = false;
 
-  depsSha256 = "1qzzpnkyw1bn5fnj06c80f7985v1q0rqcphrrrkpbi33lg5mzgbv";
+  cargoSha256 = "0r69vghjd6b30v0qjsipyv56n92iwvyxmllrnwjzjf5pzhhjl7sy";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index d9d84e83430..75c9e6ecf8c 100755
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -14,13 +14,14 @@ buildRustPackage rec {
     sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
   };
 
-  depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc";
+  cargoSha256 = "06qivlybmmc49ksv4232sm1r4hp923xsq4c2ksa4i2azdzc1csdc";
 
   buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "Customizable Wayland compositor (window manager)";
     longDescription = ''
       Way Cooler is a customizable tiling window manager written in Rust
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 598bd23c164..a4eff26d88c 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
   };
 
-  depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71";
+  cargoSha256 = "0z92ml84b5652zgwzn08a8vvxksaa54jql66sfpdz1mvjwhgdmvn";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libXinerama libX11 ];
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "A tiling window manager in Rust";
     homepage = https://github.com/Kintaro/wtftw;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix
new file mode 100644
index 00000000000..6b50f8b83e7
--- /dev/null
+++ b/pkgs/build-support/rust/cargo-vendor.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv }:
+let
+  inherit (stdenv) system;
+
+  version = "0.1.12";
+
+  hashes = {
+    x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5";
+    x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm";
+  };
+  hash = hashes. ${system} or (throw "missing bootstrap hash for platform ${system}");
+
+  platforms = {
+    x86_64-linux = "x86_64-unknown-linux-musl";
+    x86_64-darwin = "x86_64-apple-darwin";
+  };
+  platform = platforms . ${system};
+
+in stdenv.mkDerivation {
+  name = "cargo-vendor-${version}";
+
+  src = fetchurl {
+     url = "https://github.com/alexcrichton/cargo-vendor/releases/download/${version}/cargo-vendor-${version}-${platform}.tar.gz";
+     sha256 = hash;
+  };
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    install -Dm755 cargo-vendor $out/bin/cargo-vendor
+  '';
+}
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 36130289fba..2b32da11d1c 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }:
-
+{ fetchurl, stdenv, path, cacert, git, rust }:
 let
-  rustRegistry' = rustRegistry;
+  cargoVendor = import ./cargo-vendor.nix {
+    inherit fetchurl stdenv;
+  };
+
+  fetchcargo = import ./fetchcargo.nix {
+    inherit stdenv cacert git rust cargoVendor;
+  };
 in
-{ name, depsSha256
-, rustRegistry ? rustRegistry'
+{ name, cargoSha256
 , src ? null
 , srcs ? null
 , sourceRoot ? null
@@ -18,17 +22,13 @@ in
 let
   lib = stdenv.lib;
 
-  fetchDeps = import ./fetchcargo.nix {
-    inherit stdenv cacert git rust rustRegistry;
-  };
-
-  cargoDeps = fetchDeps {
+  cargoDeps = fetchcargo {
     inherit name src srcs sourceRoot cargoUpdateHook;
-    sha256 = depsSha256;
+    sha256 = cargoSha256;
   };
 
 in stdenv.mkDerivation (args // {
-  inherit cargoDeps rustRegistry;
+  inherit cargoDeps;
 
   patchRegistryDeps = ./patch-registry-deps;
 
@@ -43,71 +43,24 @@ in stdenv.mkDerivation (args // {
   postUnpack = ''
     eval "$cargoDepsHook"
 
-    echo "Using cargo deps from $cargoDeps"
+    mkdir .cargo
+    cat >.cargo/config <<-EOF
+      [source.crates-io]
+      registry = 'https://github.com/rust-lang/crates.io-index'
+      replace-with = 'vendored-sources'
 
-    cp -a "$cargoDeps" deps
-    chmod +w deps -R
-
-    # It's OK to use /dev/null as the URL because by the time we do this, cargo
-    # won't attempt to update the registry anymore, so the URL is more or less
-    # irrelevant
-
-    cat <<EOF > deps/config
-    [registry]
-    index = "file:///dev/null"
+      [source.vendored-sources]
+      directory = '$cargoDeps'
     EOF
 
-    export CARGO_HOME="$(realpath deps)"
     export RUST_LOG=${logLevel}
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-
-    # Let's find out which $indexHash cargo uses for file:///dev/null
-    (cd $sourceRoot && cargo fetch &>/dev/null) || true
-    cd deps
-    indexHash="$(basename $(echo registry/index/*))"
-
-    echo "Using indexHash '$indexHash'"
-
-    rm -rf -- "registry/cache/$indexHash" \
-              "registry/index/$indexHash"
-
-    mv registry/cache/HASH "registry/cache/$indexHash"
-
-    echo "Using rust registry from $rustRegistry"
-    ln -s "$rustRegistry" "registry/index/$indexHash"
-
-    # Retrieved the Cargo.lock file which we saved during the fetch
-    cd ..
-    mv deps/Cargo.lock $sourceRoot/
-
-    (
-        cd $sourceRoot
-
-        cargo fetch
-        cargo clean
-    )
   '' + (args.postUnpack or "");
 
-  prePatch = ''
-    # Patch registry dependencies, using the scripts in $patchRegistryDeps
-    (
-        set -euo pipefail
-
-        cd $NIX_BUILD_TOP/deps/registry/src/*
-
-        for script in $patchRegistryDeps/*; do
-          # Run in a subshell so that directory changes and shell options don't
-          # affect any following commands
-
-          ( . $script)
-        done
-    )
-  '' + (args.prePatch or "");
-
   buildPhase = with builtins; args.buildPhase or ''
     runHook preBuild
     echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
-    cargo build --release ${concatStringsSep " " cargoBuildFlags}
+    cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags}
     runHook postBuild
   '';
 
@@ -126,4 +79,6 @@ in stdenv.mkDerivation (args // {
     find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \;
     runHook postInstall
   '';
+
+  passthru = { inherit cargoDeps; };
 })
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
deleted file mode 100755
index 3c7e034364f..00000000000
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ /dev/null
@@ -1,209 +0,0 @@
-# copied from libgit2 source code 'repo-template.h'
-makeGitTemplate() {
-    local target="$1"
-    mkdir -p -m777 "$target/info" "$target/pack" "$target/objects" "$target/refs"
-    mkdir -p -m777 "$target/refs/heads" "$target/refs/tags" "$target/objects/info" "$target/objects/pack"
-    cat <<'EOF' > "$target/description"
-Unnamed repository; edit this file 'description' to name the repository.
-EOF
-    chmod 666 "$target/description"
-    cat <<'EOF' > "$target/info/exclude"
-# File patterns to ignore; see `git help ignore` for more information.
-# Lines that start with '#' are comments.
-EOF
-}
-
-fetchCargoDeps() {
-    src=$(realpath $1)
-    out=$(realpath $2)
-
-    echo "Fetching $src to $out"
-
-    mkdir $out
-
-    # Configure git template dir to make libgit2 more deterministic
-    #
-    # Without a template dir, libgit2 defaults to /usr/share/git-core/templates,
-    # which can vary between systems if sandboxed builds aren't used.
-    #
-    # Note: we explictly set --tmpdir for mktemp here to make it more friendly
-    # for nix-shell users, where $TMPDIR is not necessarily set to NIX_BUILD_TOP
-    echo "Setting up git templatedir"
-    export GIT_TEMPLATE_DIR="$(mktemp -d --tmpdir=$NIX_BUILD_TOP git-template.XXX)"
-    makeGitTemplate "$GIT_TEMPLATE_DIR"
-    export XDG_CONFIG_HOME="$(mktemp -d --tmpdir=$NIX_BUILD_TOP home.XXX)"
-    mkdir -p $XDG_CONFIG_HOME/git
-    cat <<EOF > $XDG_CONFIG_HOME/git/config
-[init]
-  templatedir = $GIT_TEMPLATE_DIR
-EOF
-
-    # Configure cargo to fetch from a local copy of the crates.io registry
-
-    echo "Using rust registry from $rustRegistry"
-
-    cat <<EOF > $out/config
-[registry]
-index = "file://$rustRegistry"
-EOF
-
-    export CARGO_HOME=$out
-    cd $src
-
-    if [[ ! -f Cargo.lock ]]; then
-        echo
-        echo "ERROR: The Cargo.lock file doesn't exist"
-        echo
-        echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
-        echo "when the registry is updated."
-        echo
-
-        exit 1
-    fi
-
-    # We need to do the following string replacement so that 'cargo fetch'
-    # doesn't ignore the versions specified in Cargo.lock
-    substituteInPlace Cargo.lock \
-        --replace "registry+https://github.com/rust-lang/crates.io-index" \
-                  "registry+file://$rustRegistry"
-
-    # Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
-    eval "$cargoUpdateHook"
-
-    # Do the fetch
-    cargo fetch --verbose
-
-    # Now that we have fetched everything, let's make the output deterministic
-
-    # Cargo uses the following directory structure for fetched data, where
-    # $indexHash is a hash of the registry index URL:
-    #
-    #
-    # /config:
-    #
-    #     Cargo config file. We'll delete this because it's not deterministic,
-    #     and instead recreate it just before running 'cargo build'.
-    #
-    # /registry/cache/$indexHash/:
-    #
-    #     This is where tarballs of registry package dependencies are kept
-    #     We'll need to keep this, but make sure $indexHash is a fixed name.
-    #
-    # /registry/index/$indexHash/:
-    #
-    #     A copy of the registry index is kept here. We can delete this, and
-    #     instead, just before running 'cargo build', we'll symlink this
-    #     directory to our static copy of the registry in the Nix store.
-    #
-    # /registry/src/$indexHash/{pkgName-pkgVersion}/:
-    #
-    #     Here cargo keeps extracted sources of the cached tarballs.
-    #     We'll just delete this because cargo will re-populate them from the
-    #     tarballs.
-    #
-    # /git/db/{domain-hash}/:
-    #
-    #     Here cargo keeps the `.git` directories of git dependencies.
-    #     We'll need to keep these, but make them deterministic.
-    #
-    # /git/checkouts/{domain-hash}/{branchName}/:
-    #
-    #     Here cargo keeps checked-out sources of the git dependencies.
-    #     We can delete this, because cargo will re-populate them from the above
-    #     `.git` directories.
-    #
-    # Let's start
-
-    # Remove cargo config file, which points to the ever-changing registry
-    rm $out/config
-
-    # Save the Cargo.lock file into the output, so that we don't have to do another
-    # 'cargo update' during the build (which would try to access the network) for
-    # any ad-hoc package updates (through $cargoUpdateHook).
-    #
-    # We need to replace the rustRegistry URL with something deterministic.
-    # Since the URL won't actually be accessed anymore, it's fine to use /dev/null.
-
-    substituteInPlace Cargo.lock \
-        --replace "registry+file://$rustRegistry" \
-                  "registry+file:///dev/null"
-    mv Cargo.lock $out/
-
-
-    # Let's replace $indexHash with something more deterministic
-    mv $out/registry/cache/* $out/registry/cache/HASH
-
-    # The registry index changes all the time, so it's not deterministic
-    # We'll symlink it before running 'cargo build'
-    rm -rf $out/registry/index/*
-
-    # Make git DBs deterministic
-    # TODO: test with git submodules
-    [[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do
-        revs=""
-        cd "$out/git/checkouts/$name"
-        while read dir; do
-            # extract substring: [dir = "./xxx/yyy/.git"] => [branch = "xxx/yyy"]
-            branch="${dir:2:$((${#dir}-7))}"
-
-            cd "$out/git/checkouts/$name/$branch"
-            rev="$(git rev-parse HEAD)"
-            revs="$rev $revs"
-        done < <(find . -type d -name .git -print)
-
-        echo "List of revs to keep for git db $name: $revs"
-
-        (
-            # The following code was adapted from nix-prefetch-git
-
-            cd "$out/git/db/$name"
-
-            export GIT_DIR=.
-
-            # Remove all remote branches
-            git branch -r | while read branch; do
-                git branch -rD "$branch" >&2
-            done
-
-            # Remove all tags
-            git tag | while read tag; do
-                git tag -d "$tag" >&2
-            done
-
-            # Remove all local branches
-            branchrefs=()
-            eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
-
-            for branchref in "${branchrefs[@]}"; do
-                git update-ref -d "$branchref" >&2
-            done
-
-            # Create ad-hoc branches for the revs we need
-            echo "$revs" | while read -d " " rev; do
-                echo "Creating git branch b_$rev $rev"
-                git branch b_$rev $rev
-            done
-
-            # Remove files that have timestamps or otherwise have non-deterministic
-            # properties.
-            rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
-
-            # Do a full repack. Must run single-threaded, or else we lose determinism.
-            git config pack.threads 1
-            git repack -A -d -f
-            rm -f config
-
-            # Garbage collect unreferenced objects.
-            git gc --prune=all
-        )
-    done)
-
-    # Remove unneeded outputs
-    [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
-    [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
-
-    # XXX: provide some debugging output to see find out why we are seeing
-    # sporadic hash mismatches
-    find $out ! -type f
-    find $out -type f -exec sha256sum {} +
-}
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 0c9625e5140..9b3ba530339 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,19 +1,30 @@
-{ stdenv, cacert, git, rust, rustRegistry }:
+{ stdenv, cacert, git, rust, cargoVendor }:
 { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
-
 stdenv.mkDerivation {
-  name = "${name}-fetch";
-  buildInputs = [ rust.cargo rust.rustc git ];
-  inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
+  name = "${name}-vendor";
+  buildInputs = [ cacert cargoVendor git rust.cargo ];
+  inherit src srcs sourceRoot;
 
   phases = "unpackPhase installPhase";
 
   installPhase = ''
-    source ${./fetch-cargo-deps}
+    if [[ ! -f Cargo.lock ]]; then
+        echo
+        echo "ERROR: The Cargo.lock file doesn't exist"
+        echo
+        echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
+        echo "when the registry is updated."
+        echo
+
+        exit 1
+    fi
 
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    export CARGO_HOME=$(mktemp -d cargo-home.XXX)
 
-    fetchCargoDeps . "$out"
+    cargo vendor
+
+    cp -ar vendor $out
   '';
 
   outputHashAlgo = "sha256";
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2f1cf07c3b8..ec890b3bf7a 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
-, version, srcSha, depsSha256
+, version, srcSha, cargoSha256
 , patches ? []}:
 
 rustPlatform.buildRustPackage rec {
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = srcSha;
   };
 
-  inherit depsSha256;
+  inherit cargoSha256;
   inherit patches;
 
   passthru.rustc = rustc;
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 122bda0f70b..73788189af3 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -22,7 +22,7 @@ rec {
     };
 
     patches = [
-      ./patches/darwin-disable-fragile-tcp-tests.patch
+      ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
   };
@@ -30,7 +30,7 @@ rec {
   cargo = callPackage ./cargo.nix rec {
     version = "0.21.1";
     srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7";
-    depsSha256 = "0pzfn1zjgklr0fw9zi9sxrwr08q3wcvdl9ybxrk3ld7ps5h9wmsi";
+    cargoSha256 = "02gdh71jkhmr17q5gam079ig5dvpw1fms3v6k5h2bg3fclw7kkrs";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
similarity index 55%
rename from pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
rename to pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
index da550f0327d..f55d0badb82 100644
--- a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
+++ b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
@@ -1,17 +1,18 @@
-From 1d8a91d5b09cb762fe890d04bfb61b9eefd0624a Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Sun, 8 Jan 2017 10:28:17 +0100
-Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
+From 26d3b70abec1adf773522643b31ce9c03439916a Mon Sep 17 00:00:00 2001
+From: Joerg Thalheim <joerg@thalheim.io>
+Date: Tue, 10 Oct 2017 00:40:20 +0100
+Subject: [PATCH] Disable fragile tests libstd::net::tcp on Darwin/Linux
 
+Signed-off-by: Joerg Thalheim <joerg@thalheim.io>
 ---
- src/libstd/net/tcp.rs | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ src/libstd/net/tcp.rs | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 0e7c5b0671..d42fd26267 100644
+index 8d1e7882e5..2c223fb315 100644
 --- a/src/libstd/net/tcp.rs
 +++ b/src/libstd/net/tcp.rs
-@@ -551,6 +551,7 @@ mod tests {
+@@ -949,6 +949,7 @@ mod tests {
          })
      }
  
@@ -19,7 +20,7 @@ index 0e7c5b0671..d42fd26267 100644
      #[test]
      fn write_close() {
          each_ip(&mut |addr| {
-@@ -1022,7 +1023,10 @@ mod tests {
+@@ -1421,7 +1422,10 @@ mod tests {
  
      // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
      //        no longer has rounding errors.
@@ -31,7 +32,7 @@ index 0e7c5b0671..d42fd26267 100644
      #[test]
      fn timeouts() {
          let addr = next_test_ip4();
-@@ -1101,6 +1105,7 @@ mod tests {
+@@ -1500,6 +1504,7 @@ mod tests {
          assert_eq!(false, t!(stream.nodelay()));
      }
  
@@ -39,6 +40,14 @@ index 0e7c5b0671..d42fd26267 100644
      #[test]
      fn ttl() {
          let ttl = 100;
+@@ -1568,6 +1573,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "linux", ignore)]
+     #[test]
+     fn connect_timeout_unroutable() {
+         // this IP is unroutable, so connections should always time out,
 -- 
-2.11.0
+2.14.2
 
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 681e6fcc528..fd5796276f7 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -3,17 +3,17 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  version = "0.3.4";
+  version = "2017-06-23";
   name = "loc-${version}";
 
   src = fetchFromGitHub {
     owner = "cgag";
     repo = "loc";
-    rev = "9f3590f6299a1be3560f00de7f4f8bef61a02642";
-    sha256 = "0dga8prwnnmsa616jh64wzic957ff0491xghm0bjlns35ajc8lif";
+    rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38";
+    sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn";
   };
 
-  depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6";
+  cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb";
 
   meta = {
     homepage = http://github.com/cgag/loc;
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index f64ead3e107..1cd8f7757f9 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
-  depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3";
+  cargoSha256 = "1pi8fh6vz6m5hr38wm0v0hxp1yxm1ma8yzish3b78zkv8f90kmv0";
 
   meta = {
     description = "Generate changelogs from local git metadata";
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index b792cfe8c99..44120ad023a 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }:
+{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }:
 
 with rustPlatform;
 
@@ -13,14 +13,24 @@ buildRustPackage rec {
     sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
   };
 
-  depsSha256 = "1xypk9ck7znca0nqm61m5ngpz6q7c0wydlpwxq4mnkd1np27xn53";
+  cargoSha256 = "06w864f73kijq24xzljfaf47d97aqyg4md3crzbq8hns157m3sv2";
+
+  cargoDepsHook = ''
+    (
+      cd ${name}-src
+      # see https://github.com/git-series/git-series/pull/56
+      patch -p1 < ${fetchpatch {
+        url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
+        sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
+      }}
+    )
+  '';
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
   buildInputs = [ openssl zlib ];
 
   postBuild = ''
-    mkdir -p "$out/man/man1"
-    cp "$src/git-series.1" "$out/man/man1"
+    install -D "$src/git-series.1" "$out/man/man1/git-series.1"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index c0a56648db9..b44548c8ffd 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd";
   };
 
-  depsSha256 = "1cz93mrpxmyrza0ipdyg2a6mynl66plpsb446wxnmmy7y7zd6xbf";
+  cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz";
 
   installPhase = ''
     mkdir -p $out/bin
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "Count code, quickly";
     homepage = https://github.com/Aaronepower/tokei;
     license = licenses.mit;
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index eef8b660c41..ca2aea2399f 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
   };
 
-  depsSha256 = "138h0q2a2gghfjpwfi11zw4rkipvmglb7srqz56ibbw2xliid2wl";
+  cargoSha256 = "0c4awm1d87b396d3g3mp1md5p92i5a64a9jdawpr8mwjd0bly05m";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
 
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 78a327c9ea1..1240e7cc38f 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "06b5zyw9p7h73h30c1nlnwjb0zmkfx52wqsl9b14y9hx51g9bw0r";
+  cargoSha256 = "128skg31lc9v8i7ghfb3wyiazivqfvzhi1mvmjcl0gkx1hi5006v";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 89c384eb6ec..57b685e946d 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
   };
 
-  depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1";
+  cargoSha256 = "1w5imxyqlyv24dvzncq6dy01zn2x8p1aciyvzh8ac1x1wdjcacjc";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index b2340e01c1a..f3cb4e78950 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
 
   doCheck = false;
 
-  depsSha256 = "0db18m0vxzvg821gb5g8njhlnxw7im81m089i4982n8hmnhm1497";
+  cargoSha256 = "1h7hm7vkk1grah6pn5ydfi5pzc2kd48lh2kxim5jlvrxhd2dingg";
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index b6cbeb88402..370318d1ff2 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -13,9 +13,10 @@ buildRustPackage rec {
     sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01";
   };
 
-  depsSha256 = "1ckrf77s1glrqi0gvrv9wqmip4i97dk0arn0iz87jg4q2wfss85k";
+  cargoSha256 = "14kd25mw6m20blqcr221cclcqxw0j229zxq8hsaay6q7jgv0c7a0";
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "Rust IDEs.  parse-analysis";
     homepage = https://github.com/RustDT/Rainicorn;
     license = with licenses; [ mit asl20 ];
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 0e3802a214f..b8585dace54 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12l3ff0s0pzhcf5jbs8wqawjk4jghhhz8j6dq1n5201yvny12jlr";
   };
 
-  depsSha256 = "1nnb2lpzjf6hv1a7cw3cbkc22fb54rsp6h87wzmqi4hsy1csff7a";
+  cargoSha256 = "0gppki9mgx99xipapg36ydwk1bplygnz6sbyzbg46vhn10iggfwm";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 59cdf443f4a..65599ad8d18 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
   version = "1.3.0";
 
-  depsSha256 = "078hssgffgpakv735p1xg60kic151r2dvpdr9sipb63lwqr4dxfb";
+  cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix
index 2459e157a90..37a609db036 100644
--- a/pkgs/misc/tw-rs/default.nix
+++ b/pkgs/misc/tw-rs/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ perl zlib openssl ]
     ++ stdenv.lib.optional stdenv.isDarwin curl;
 
-  depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05";
+  cargoSha256 = "0c3324b7z77kiwc6whbppfmrli254fr1nyd0vpsxvpc0av3279jg";
 
   meta = with stdenv.lib; {
     description = "Twitter command-line interface written in rust";
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 4ab03b31fb9..b7e42370125 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3";
   };
 
-  depsSha256 = "0w2jgbrcx57js8ihzs5acp6b1niw1c7khdxrv14y3z9mmm9j55hs";
+  cargoSha256 = "0ydi44710as0bb442zryzx30nk4mscdw3gsahwprnsvvaril33rn";
 
   meta = with stdenv.lib; {
     description = "Modern system shell with simple (and powerful) syntax";
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 4024ab9b91f..2b663cd3bce 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
     sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
   };
 
-  depsSha256 = "1n57i9wkak76ram748mwq0dn32d041ajd31laqc13c76pp29agrp";
+  cargoSha256 = "1fcl2nnplcic729cmvall2k7wf3jdm7dspvlbxji99bn813ackig";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index c4678c8d4b7..759230c6a29 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
     sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
   };
 
-  depsSha256 = "0wzr8hk63gh3nm8f7dbzwj8pgc3cm8p8mr2q7bbgvri1a5i83sfb";
+  cargoSha256 = "0q3mrcvl1yyrx4a88kanjlfcx6slf7r79i0dh4w81sj6gp07sssm";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index e98b62bd0ea..a4ac74e9f2d 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
     sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq";
   };
 
-  depsSha256 = "0nax7h7f5qgalgxsfidrxrv1ybl5xvrpc1k7xc1kmaf955gqmc46";
+  cargoSha256 = "0qwbgwxrjc0dvjbpqa59jixy5nq7lng2c1z91rw48qc91v7fa664";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index 4c22268a1c8..d2a82dc357b 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -12,7 +12,7 @@ buildRustPackage rec {
     sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
   };
 
-  depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a";
+  cargoSha256 = "0dmn9bccicxhqcj9zrsxxp0vb5ma12a1hs9brpc22n4g1qy4yzcn";
 
   buildInputs = [ lzo zlib ];
 
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 488f7482b15..cb77edf0d29 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -6,7 +6,7 @@ buildRustPackage rec {
   name = "exa-${version}";
   version = "0.8.0";
 
-  depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2";
+  cargoSha256 = "08zzn3a32xfjkmpawcjppn1mr26ws3iv40cckiz8ldz4qc8y9gdh";
 
   src = fetchFromGitHub {
     owner = "ogham";
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 07d8a661d7b..54d17e6f64c 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv";
   };
 
-  depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g";
+  cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j";
 
   meta = {
     description = "A simple, fast and user-friendly alternative to find";
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 499b4a87bc4..e7ddcf572ae 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7";
   };
 
-  depsSha256 = "05mj84a5k65ai492grwg03c3wq6ardhs114bv951fgysc9rs07p5";
+  cargoSha256 = "0kqkzjd90v19qvl3iv1vv2fi8h0z75b0yn0z5jq8w4m94fvh0p95";
 
   # some tests require a tty, this variable turns them off for Travis CI,
   # which we can also make use of
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 4a34e62322d..ecb0708eb30 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -15,7 +15,7 @@ buildRustPackage rec {
 
   buildInputs = [ zlib openssl ];
 
-  depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq";
+  cargoSha256 = "1m4yb7472g1n900dh3xqvdcywk3v01slj3bkk7bk7a9p5x1kyjfn";
 
   meta = with stdenv.lib; {
     description = "A utility for managing cargo dependencies from the command line";
@@ -23,5 +23,6 @@ buildRustPackage rec {
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ jb55 ];
     platforms = platforms.all;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 70cd83b87a3..df5a39d6a03 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -12,7 +12,7 @@ buildRustPackage rec {
     rev = "v${version}";
     sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5";
   };
-  depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl";
+  cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2";
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl curl];
 
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 8ddfa7d7be4..0d1c60dc694 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a";
   };
 
-  depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m";
+  cargoSha256 = "00y2vdnrg02clqin9pg57s9micrp66f6y49wq89cmykrfg3r8cwf";
 
   preFixup = ''
     mkdir -p "$out/man/man1"
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index 34e1413150f..973585abc81 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -11,9 +11,10 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm";
   };
 
-  depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c";
+  cargoSha256 = "074mfyanwdykg6wci2ia63wcnnyik741g8n624pac215sg4i95h7";
 
   meta = {
+    broken = true;
     description = "A command line program that lets you compute statistics from values from a file or standard input";
     longDescription = ''
       Staccato (`st` for short) is a command line program that lets you
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index db84eac4a23..23f172f4ebe 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
     sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
   };
 
-  depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q";
+  cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index f6c3be63e03..3fdebd19f3c 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -14,7 +14,7 @@ buildRustPackage rec {
     sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv";
   };
 
-  depsSha256 = "1vxvkh1v9x6j4ggbh6sysi5i3089hrs0mjbp910a1jljiav7l8nj";
+  cargoSha256 = "03bqhgz8c4ipdkd3g448bcrr6d188h87vskcfcc3mqlcxg77b8q5";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9de63505831..20d9ba83354 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -130,7 +130,6 @@ mapAliases (rec {
   robomongo = robo3t; #added 2017-09-28
   rssglx = rss-glx; #added 2015-03-25
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
-  rustUnstable = rustNightly; # added 2016-11-29
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
   samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
   saneBackends = sane-backends; # added 2016-01-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed1c957756..f2e6cb87013 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6179,8 +6179,6 @@ with pkgs;
   rust = callPackage ../development/compilers/rust { };
   inherit (rust) cargo rustc;
 
-  rustRegistry = callPackage ./rust-packages.nix { };
-
   rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
 
   makeRustPlatform = rust: lib.fix (self:
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
deleted file mode 100644
index 92230993d58..00000000000
--- a/pkgs/top-level/rust-packages.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file defines the source of Rust / cargo's crates registry
-#
-# buildRustPackage will automatically download dependencies from the registry
-# version that we define here. If you're having problems downloading / finding
-# a Rust library, try updating this to a newer commit.
-
-{ stdenv, fetchFromGitHub, git }:
-
-stdenv.mkDerivation {
-  name = "rustRegistry-2017-10-08";
-
-  src = fetchFromGitHub {
-    owner = "rust-lang";
-    repo = "crates.io-index";
-    rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86";
-    sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0";
-  };
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    # For some reason, cargo doesn't like fetchgit's git repositories, not even
-    # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
-    # the repository (tested with registry rev
-    # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message:
-    #
-    # "Target OID for the reference doesn't exist on the repository"
-    #
-    # So we'll just have to create a new git repository from scratch with the
-    # contents downloaded with fetchgit...
-
-    mkdir -p $out
-
-    cp -r ./* $out/
-
-    cd $out
-
-    git="${git}/bin/git"
-
-    $git init
-    $git config --local user.email "example@example.com"
-    $git config --local user.name "example"
-    $git add .
-    $git commit --quiet -m 'Rust registry commit'
-
-    touch $out/touch . "$out/.cargo-index-lock"
-  '';
-}

From 6bbce42fe7909fc0096f27be2f7958cf53f6ac17 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 19 Oct 2017 22:29:28 +0000
Subject: [PATCH 27/97] cargo: 0.21.1 -> 0.22.0

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

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 73788189af3..c42c958b170 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -28,9 +28,9 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.21.1";
-    srcSha = "1nz7sz7rzc6i1c0nzf6kmnmaq1l3hgrg19s589q7k309r6m7p7f7";
-    cargoSha256 = "02gdh71jkhmr17q5gam079ig5dvpw1fms3v6k5h2bg3fclw7kkrs";
+    version = "0.22.0";
+    srcSha = "0x9pm73hkkd1hq4qrmz8iv91djgpdsxzwll7jari0h77vpwajmw4";
+    cargoSha256 = "0xd0rb8gcqy6xngsx9l30jg3fqrcwccgv904ksqs9c4d44hga0gd";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo

From 562f8313e0a6acaa5d99f689150cd71d04707605 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 22 Oct 2017 21:46:40 -0400
Subject: [PATCH 28/97] ipget: init at 0.2.5

---
 .../applications/networking/ipget/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/ipget/default.nix

diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
new file mode 100644
index 00000000000..23c9d7df812
--- /dev/null
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
+
+buildGoPackage rec {
+  name = "ipget-${version}";
+  version = "0.2.5";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/ipfs/ipget";
+  
+  extraSrcPaths = [
+    (fetchgx {
+      inherit name src;
+      sha256 = "1d4w8zl5mcppn3d4bl7qdkiqlf8gi3z2a62nygx17bqpa3da8cf3";
+    })
+  ];
+ 
+  goDeps = ../../../tools/package-management/gx/deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "ipfs";
+    repo = "ipget";
+    inherit rev;
+    sha256 = "0a8yxqhl469ipiznrgkp3yi1xz3xzcbpx60wabqppq8hccrdiybk";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Retrieve files over IPFS and save them locally";
+    homepage = https://ipfs.io/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38ee66735e..7aec468907a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2717,6 +2717,8 @@ with pkgs;
   ipfs = callPackage ../applications/networking/ipfs { };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
 
+  ipget = callPackage ../applications/networking/ipget { };
+
   ipmitool = callPackage ../tools/system/ipmitool {
     static = false;
   };

From fd3bb2589555c2c6f63251b977fdc655bd7d9c9b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Oct 2017 09:52:38 +0800
Subject: [PATCH 29/97] dropbox: 36.4.22 -> 37.4.29

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 0972cc759ab..89a473f0cd0 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,10 +24,10 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "36.4.22";
+  version = "37.4.29";
   sha256 = {
-    "x86_64-linux" = "0hhnigwxqmr00zmlysc1y1k4bzrdrcabcnw44bniarwa2l4fw0v0";
-    "i686-linux"   = "15l7m33b0qlz8m6h7kh1fkxs37dq8jqy04b3qf693ns7wb5l0sqm";
+    "x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj";
+    "i686-linux"   = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch = {

From 9af922ac7860d4bb138c69afc237f377764caf6b Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Mon, 23 Oct 2017 11:01:52 +0300
Subject: [PATCH 30/97] ripgrep: 0.6.0 -> 0.7.1

---
 pkgs/tools/text/ripgrep/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 0d1c60dc694..9a93ec2d767 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.6.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a";
+    sha256 = "0z3f83vhy464k93bc55i9lr6z41163q96if938p9ndhx2q3a20ql";
   };
 
-  cargoSha256 = "00y2vdnrg02clqin9pg57s9micrp66f6y49wq89cmykrfg3r8cwf";
+  cargoSha256 = "1d6s01gmyfzb0vdf7flq6nvlapwcgbj0mzcprzyg4nj5gjkvznrn";
 
   preFixup = ''
     mkdir -p "$out/man/man1"

From 3983d79dc2f2d59c4a946857973151af6c15333a Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Mon, 23 Oct 2017 11:12:38 +0300
Subject: [PATCH 31/97] ion: 1.0.3 -> 1.0.5

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

diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index b7e42370125..1333bfd873f 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ion-${version}";
-  version = "1.0.3";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "redox-os";
     repo = "ion";
     rev = version;
-    sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3";
+    sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z";
   };
 
-  cargoSha256 = "0ydi44710as0bb442zryzx30nk4mscdw3gsahwprnsvvaril33rn";
+  cargoSha256 = "0ffp6r5jqyf9j8jd77vbvc6l3xm09ipbraj6av6iciw1sxskib33";
 
   meta = with stdenv.lib; {
     description = "Modern system shell with simple (and powerful) syntax";

From f1f7296885109b8c126acf47915ebc678beaf8a2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 23 Oct 2017 10:23:34 +0200
Subject: [PATCH 32/97] cargo: fix darwin build

---
 pkgs/development/compilers/rust/cargo.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index ec890b3bf7a..5225e95b1e1 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
 , version, srcSha, cargoSha256
 , patches ? []}:
 
@@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+    # FIXME: Use impure version of CoreFoundation because of missing symbols.
+    # CFURLSetResourcePropertyForKey is defined in the headers but there's no
+    # corresponding implementation in the sources from opensource.apple.com.
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation libiconv ];
 
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 

From f73ad01afb7693290bcbb9667d84e2e12862a950 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Mon, 23 Oct 2017 11:04:40 +0100
Subject: [PATCH 33/97] nodePackages.web-ext: init at 2.2.2

---
 .../node-packages/node-packages-v4.nix        |  786 +-
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 6310 +++++++++++------
 3 files changed, 4680 insertions(+), 2417 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 88a3d669b37..c6ef2bdfe8c 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -130,13 +130,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "abbrev-1.1.0" = {
+    "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
-        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
     "archy-1.0.0" = {
@@ -1741,13 +1741,13 @@ let
         sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
       };
     };
-    "request-2.82.0" = {
+    "request-2.83.0" = {
       name = "request";
       packageName = "request";
-      version = "2.82.0";
+      version = "2.83.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz";
-        sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx";
+        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
+        sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
       };
     };
     "rimraf-2.6.2" = {
@@ -2119,13 +2119,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-5.2.2" = {
+    "ajv-5.2.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.2.2";
+      version = "5.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
-        sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz";
+        sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b";
       };
     };
     "har-schema-2.0.0" = {
@@ -2398,31 +2398,31 @@ let
         sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
       };
     };
-    "express-4.15.4" = {
+    "express-4.16.2" = {
       name = "express";
       packageName = "express";
-      version = "4.15.4";
+      version = "4.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz";
-        sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1";
+        url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz";
+        sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c";
       };
     };
-    "rc-1.2.1" = {
+    "rc-1.2.2" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz";
-        sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz";
+        sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077";
       };
     };
-    "serve-favicon-2.4.4" = {
+    "serve-favicon-2.4.5" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.4.4";
+      version = "2.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz";
-        sha1 = "412ddd74965151c9f74c0828f35d50c5250210de";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz";
+        sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk";
       };
     };
     "strong-data-uri-1.0.4" = {
@@ -2983,6 +2983,15 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
+    "body-parser-1.18.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.18.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+      };
+    };
     "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
@@ -3019,15 +3028,6 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "debug-2.6.8" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
-        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
-      };
-    };
     "depd-1.1.1" = {
       name = "depd";
       packageName = "depd";
@@ -3064,22 +3064,22 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "finalhandler-1.0.6" = {
+    "finalhandler-1.1.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.6";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz";
-        sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz";
+        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
       };
     };
-    "fresh-0.5.0" = {
+    "fresh-0.5.2" = {
       name = "fresh";
       packageName = "fresh";
-      version = "0.5.0";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz";
-        sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -3127,22 +3127,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.5" = {
+    "proxy-addr-2.0.2" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.5";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz";
-        sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
-      };
-    };
-    "qs-6.5.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz";
+        sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec";
       };
     };
     "range-parser-1.2.0" = {
@@ -3154,31 +3145,31 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "send-0.15.4" = {
+    "send-0.16.1" = {
       name = "send";
       packageName = "send";
-      version = "0.15.4";
+      version = "0.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz";
-        sha1 = "985faa3e284b0273c793364a35c6737bd93905b9";
+        url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz";
+        sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j";
       };
     };
-    "serve-static-1.12.4" = {
+    "serve-static-1.13.1" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.4";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz";
-        sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz";
+        sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5";
       };
     };
-    "setprototypeof-1.0.3" = {
+    "setprototypeof-1.1.0" = {
       name = "setprototypeof";
       packageName = "setprototypeof";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
-        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
       };
     };
     "statuses-1.3.1" = {
@@ -3199,22 +3190,22 @@ let
         sha1 = "cab10fb4909e441c82842eafe1ad646c81804410";
       };
     };
-    "utils-merge-1.0.0" = {
+    "utils-merge-1.0.1" = {
       name = "utils-merge";
       packageName = "utils-merge";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "vary-1.1.1" = {
+    "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz";
-        sha1 = "67535ebb694c1d52257457984665323f587e8d37";
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
       };
     };
     "negotiator-0.6.1" = {
@@ -3226,6 +3217,51 @@ let
         sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
       };
     };
+    "bytes-3.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+      };
+    };
+    "http-errors-1.6.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    };
+    "iconv-lite-0.4.19" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+      };
+    };
+    "raw-body-2.3.2" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz";
+        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+      };
+    };
+    "setprototypeof-1.0.3" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -3253,13 +3289,13 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "ipaddr.js-1.4.0" = {
+    "ipaddr.js-1.5.2" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.4.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
-        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz";
+        sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0";
       };
     };
     "destroy-1.0.4" = {
@@ -3271,22 +3307,13 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.6.2" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
-        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
-      };
-    };
-    "mime-1.3.4" = {
+    "mime-1.4.1" = {
       name = "mime";
       packageName = "mime";
-      version = "1.3.4";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
       };
     };
     "media-typer-0.3.0" = {
@@ -3316,15 +3343,6 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "fresh-0.5.1" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz";
-        sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c";
-      };
-    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -3649,22 +3667,13 @@ let
         sha1 = "5de60415bda071bb37127854c864f41b23254539";
       };
     };
-    "aproba-1.1.2" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
-      };
-    };
-    "bluebird-3.5.0" = {
+    "bluebird-3.5.1" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
-        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
+        sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h";
       };
     };
     "cacache-9.2.9" = {
@@ -3694,6 +3703,15 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
+    "cli-table2-0.2.0" = {
+      name = "cli-table2";
+      packageName = "cli-table2";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz";
+        sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97";
+      };
+    };
     "cmd-shim-2.0.2" = {
       name = "cmd-shim";
       packageName = "cmd-shim";
@@ -3784,6 +3802,15 @@ let
         sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a";
       };
     };
+    "is-cidr-1.0.0" = {
+      name = "is-cidr";
+      packageName = "is-cidr";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz";
+        sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc";
+      };
+    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -3937,22 +3964,31 @@ let
         sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
-    "npm-packlist-1.1.9" = {
+    "npm-packlist-1.1.10" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz";
-        sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
+        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
       };
     };
-    "npm-registry-client-8.4.0" = {
+    "npm-profile-2.0.5" = {
+      name = "npm-profile";
+      packageName = "npm-profile";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz";
+        sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl";
+      };
+    };
+    "npm-registry-client-8.5.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.4.0";
+      version = "8.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz";
+        sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -3973,13 +4009,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-6.0.2" = {
+    "pacote-6.0.4" = {
       name = "pacote";
       packageName = "pacote";
-      version = "6.0.2";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.2.tgz";
-        sha512 = "2721b5lapgglck02ikkhxgkmg5gs1l8ld712ixb94d86zrspvzn3z81678kcpqvpvs7a0ykgganm9nb1p2668zss7cdib5z6jrg7j9y";
+        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz";
+        sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -4000,6 +4036,33 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
+    "qrcode-terminal-0.11.0" = {
+      name = "qrcode-terminal";
+      packageName = "qrcode-terminal";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz";
+        sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
+      };
+    };
+    "query-string-5.0.0" = {
+      name = "query-string";
+      packageName = "query-string";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz";
+        sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947";
+      };
+    };
+    "qw-1.0.1" = {
+      name = "qw";
+      packageName = "qw";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz";
+        sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4";
+      };
+    };
     "read-1.0.7" = {
       name = "read";
       packageName = "read";
@@ -4108,13 +4171,13 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
-    "tar-4.0.1" = {
+    "tar-4.0.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.0.1.tgz";
-        sha512 = "3j6x1q724j4y32xqgmnafwr0063xlr4bw5ra92zsar6iyqikcfy02lpc98h4ss75vxywza639m3b9cps9z4xdlr2cpy6g5kyvxm86jw";
+        url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz";
+        sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2";
       };
     };
     "text-table-0.2.0" = {
@@ -4261,6 +4324,15 @@ let
         sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
       };
     };
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -4297,6 +4369,15 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
+    "cidr-regex-1.0.6" = {
+      name = "cidr-regex";
+      packageName = "cidr-regex";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz";
+        sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1";
+      };
+    };
     "dotenv-4.0.0" = {
       name = "dotenv";
       packageName = "dotenv";
@@ -4693,13 +4774,13 @@ let
         sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b";
       };
     };
-    "stream-each-1.2.0" = {
+    "stream-each-1.2.2" = {
       name = "stream-each";
       packageName = "stream-each";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
-        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
+        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
       };
     };
     "typedarray-0.0.6" = {
@@ -4747,13 +4828,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "ignore-walk-3.0.0" = {
+    "ignore-walk-3.0.1" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz";
-        sha512 = "0ly2gpx2q4zi46dbnwhp2g329vfhqrbfh1piy5hvgfzpasbq61ymaxg64qsxiqx6qqv396m0ad7abs3q3sv702w42xfli8qpm1yp8dl";
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -4774,33 +4855,6 @@ let
         sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
       };
     };
-    "npm-pick-manifest-1.0.4" = {
-      name = "npm-pick-manifest";
-      packageName = "npm-pick-manifest";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
-      };
-    };
-    "promise-retry-1.1.1" = {
-      name = "promise-retry";
-      packageName = "promise-retry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
-        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
-      };
-    };
-    "protoduck-4.0.0" = {
-      name = "protoduck";
-      packageName = "protoduck";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
-        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
-      };
-    };
     "agentkeepalive-3.3.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
@@ -4810,13 +4864,13 @@ let
         sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
-    "http-cache-semantics-3.7.3" = {
+    "http-cache-semantics-3.8.0" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "3.7.3";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz";
-        sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz";
+        sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w";
       };
     };
     "http-proxy-agent-2.0.0" = {
@@ -4846,6 +4900,15 @@ let
         sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
+    "promise-retry-1.1.1" = {
+      name = "promise-retry";
+      packageName = "promise-retry";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
+        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
+      };
+    };
     "socks-proxy-agent-3.0.1" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -4909,13 +4972,13 @@ let
         sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
       };
     };
-    "iconv-lite-0.4.19" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.19";
+    "err-code-1.1.2" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
-        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
+        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
       };
     };
     "socks-1.1.10" = {
@@ -4945,13 +5008,22 @@ let
         sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
       };
     };
-    "err-code-1.1.2" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.2";
+    "npm-pick-manifest-1.0.4" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
-        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
+      };
+    };
+    "protoduck-4.0.0" = {
+      name = "protoduck";
+      packageName = "protoduck";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
+        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
     "genfun-4.0.1" = {
@@ -4963,6 +5035,24 @@ let
         sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
       };
     };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
+    "strict-uri-encode-1.1.0" = {
+      name = "strict-uri-encode";
+      packageName = "strict-uri-encode";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+      };
+    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -5017,13 +5107,13 @@ let
         sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
       };
     };
-    "minizlib-1.0.3" = {
+    "minizlib-1.0.4" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
-        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz";
+        sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh";
       };
     };
     "yallist-3.0.2" = {
@@ -5044,13 +5134,13 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.2.1" = {
+    "boxen-1.2.2" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
-        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
+        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
       };
     };
     "configstore-3.1.1" = {
@@ -5116,13 +5206,13 @@ let
         sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
-    "chalk-2.1.0" = {
+    "chalk-2.2.0" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz";
+        sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -5161,13 +5251,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.4.0" = {
+    "supports-color-4.5.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
-        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz";
+        sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
       };
     };
     "color-convert-1.9.0" = {
@@ -5206,13 +5296,13 @@ let
         sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
       };
     };
-    "make-dir-1.0.0" = {
+    "make-dir-1.1.0" = {
       name = "make-dir";
       packageName = "make-dir";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz";
-        sha1 = "97a011751e91dd87cfadef58832ebb04936de978";
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz";
+        sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh";
       };
     };
     "unique-string-1.0.0" = {
@@ -5233,6 +5323,15 @@ let
         sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
     "crypto-random-string-1.0.0" = {
       name = "crypto-random-string";
       packageName = "crypto-random-string";
@@ -5413,15 +5512,6 @@ let
         sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "colors-1.1.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
-        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
-      };
-    };
     "fields-0.1.24" = {
       name = "fields";
       packageName = "fields";
@@ -5969,7 +6059,7 @@ in
       sources."grunt-known-options-1.1.0"
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.1.0"
+          sources."abbrev-1.1.1"
         ];
       })
       sources."resolve-1.1.7"
@@ -6507,7 +6597,7 @@ in
       })
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.1.0"
+          sources."abbrev-1.1.1"
         ];
       })
       (sources."npmlog-4.1.2" // {
@@ -6562,7 +6652,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."request-2.82.0" // {
+      (sources."request-2.83.0" // {
         dependencies = [
           sources."aws-sign2-0.7.0"
           sources."aws4-1.6.0"
@@ -6581,7 +6671,7 @@ in
           })
           (sources."har-validator-5.0.3" // {
             dependencies = [
-              (sources."ajv-5.2.2" // {
+              (sources."ajv-5.2.4" // {
                 dependencies = [
                   sources."co-4.6.0"
                   sources."fast-deep-equal-1.0.0"
@@ -6874,7 +6964,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."express-4.15.4" // {
+      (sources."express-4.16.2" // {
         dependencies = [
           (sources."accepts-1.3.4" // {
             dependencies = [
@@ -6887,30 +6977,37 @@ in
             ];
           })
           sources."array-flatten-1.1.1"
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."bytes-3.0.0"
+              (sources."http-errors-1.6.2" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.3"
+                ];
+              })
+              sources."iconv-lite-0.4.19"
+              (sources."raw-body-2.3.2" // {
+                dependencies = [
+                  sources."unpipe-1.0.0"
+                ];
+              })
+            ];
+          })
           sources."content-disposition-0.5.2"
           sources."content-type-1.0.4"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.6.8" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
           sources."depd-1.1.1"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.8.1"
-          (sources."finalhandler-1.0.6" // {
+          (sources."finalhandler-1.1.0" // {
             dependencies = [
-              (sources."debug-2.6.9" // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              })
               sources."unpipe-1.0.0"
             ];
           })
-          sources."fresh-0.5.0"
+          sources."fresh-0.5.2"
           sources."merge-descriptors-1.0.1"
           sources."methods-1.1.2"
           (sources."on-finished-2.3.0" // {
@@ -6920,28 +7017,30 @@ in
           })
           sources."parseurl-1.3.2"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.5" // {
+          (sources."proxy-addr-2.0.2" // {
             dependencies = [
               sources."forwarded-0.1.2"
-              sources."ipaddr.js-1.4.0"
+              sources."ipaddr.js-1.5.2"
             ];
           })
-          sources."qs-6.5.0"
+          sources."qs-6.5.1"
           sources."range-parser-1.2.0"
-          (sources."send-0.15.4" // {
+          sources."safe-buffer-5.1.1"
+          (sources."send-0.16.1" // {
             dependencies = [
               sources."destroy-1.0.4"
               (sources."http-errors-1.6.2" // {
                 dependencies = [
                   sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.3"
                 ];
               })
-              sources."mime-1.3.4"
+              sources."mime-1.4.1"
               sources."ms-2.0.0"
             ];
           })
-          sources."serve-static-1.12.4"
-          sources."setprototypeof-1.0.3"
+          sources."serve-static-1.13.1"
+          sources."setprototypeof-1.1.0"
           sources."statuses-1.3.1"
           (sources."type-is-1.6.15" // {
             dependencies = [
@@ -6953,8 +7052,8 @@ in
               })
             ];
           })
-          sources."utils-merge-1.0.0"
-          sources."vary-1.1.1"
+          sources."utils-merge-1.0.1"
+          sources."vary-1.1.2"
         ];
       })
       (sources."glob-5.0.15" // {
@@ -6983,7 +7082,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."deep-extend-0.4.2"
           sources."ini-1.3.4"
@@ -6992,10 +7091,10 @@ in
         ];
       })
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.4" // {
+      (sources."serve-favicon-2.4.5" // {
         dependencies = [
           sources."etag-1.8.1"
-          sources."fresh-0.5.1"
+          sources."fresh-0.5.2"
           sources."ms-2.0.0"
           sources."parseurl-1.3.2"
           sources."safe-buffer-5.1.1"
@@ -7018,7 +7117,7 @@ in
               })
               (sources."nopt-4.0.1" // {
                 dependencies = [
-                  sources."abbrev-1.1.0"
+                  sources."abbrev-1.1.1"
                   (sources."osenv-0.1.4" // {
                     dependencies = [
                       sources."os-homedir-1.0.2"
@@ -7264,7 +7363,7 @@ in
               })
               (sources."nopt-4.0.1" // {
                 dependencies = [
-                  sources."abbrev-1.1.0"
+                  sources."abbrev-1.1.1"
                   (sources."osenv-0.1.4" // {
                     dependencies = [
                       sources."os-homedir-1.0.2"
@@ -7575,7 +7674,7 @@ in
       })
       (sources."nopt-4.0.1" // {
         dependencies = [
-          sources."abbrev-1.1.0"
+          sources."abbrev-1.1.1"
           (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
@@ -7630,7 +7729,7 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."deep-extend-0.4.2"
           sources."ini-1.3.4"
@@ -7831,10 +7930,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.4.2";
+    version = "5.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz";
-      sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp";
+      url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz";
+      sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7843,13 +7942,13 @@ in
           sources."through-2.3.8"
         ];
       })
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."ansi-regex-3.0.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.1.2"
+      sources."aproba-1.2.0"
       sources."archy-1.0.0"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       (sources."cacache-9.2.9" // {
         dependencies = [
           sources."y18n-3.2.1"
@@ -7857,6 +7956,27 @@ in
       })
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
+      (sources."cli-table2-0.2.0" // {
+        dependencies = [
+          sources."lodash-3.10.1"
+          (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.1.1"
+                ];
+              })
+            ];
+          })
+          sources."colors-1.1.2"
+        ];
+      })
       sources."cmd-shim-2.0.2"
       (sources."columnify-1.5.4" // {
         dependencies = [
@@ -7918,6 +8038,11 @@ in
           sources."promzard-0.3.0"
         ];
       })
+      (sources."is-cidr-1.0.0" // {
+        dependencies = [
+          sources."cidr-regex-1.0.6"
+        ];
+      })
       sources."lazy-property-1.0.0"
       (sources."libnpx-9.6.0" // {
         dependencies = [
@@ -8081,7 +8206,7 @@ in
           })
           sources."pump-1.0.2"
           sources."pumpify-1.3.5"
-          (sources."stream-each-1.2.0" // {
+          (sources."stream-each-1.2.2" // {
             dependencies = [
               sources."stream-shift-1.0.0"
             ];
@@ -8140,9 +8265,9 @@ in
       sources."npm-install-checks-3.0.0"
       sources."npm-lifecycle-1.0.3"
       sources."npm-package-arg-5.1.2"
-      (sources."npm-packlist-1.1.9" // {
+      (sources."npm-packlist-1.1.10" // {
         dependencies = [
-          (sources."ignore-walk-3.0.0" // {
+          (sources."ignore-walk-3.0.1" // {
             dependencies = [
               (sources."minimatch-3.0.4" // {
                 dependencies = [
@@ -8159,7 +8284,95 @@ in
           sources."npm-bundled-1.0.3"
         ];
       })
-      (sources."npm-registry-client-8.4.0" // {
+      (sources."npm-profile-2.0.5" // {
+        dependencies = [
+          (sources."make-fetch-happen-2.5.0" // {
+            dependencies = [
+              (sources."agentkeepalive-3.3.0" // {
+                dependencies = [
+                  (sources."humanize-ms-1.2.1" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."http-cache-semantics-3.8.0"
+              (sources."http-proxy-agent-2.0.0" // {
+                dependencies = [
+                  (sources."agent-base-4.1.1" // {
+                    dependencies = [
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."debug-2.6.9" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."https-proxy-agent-2.1.0" // {
+                dependencies = [
+                  (sources."agent-base-4.1.1" // {
+                    dependencies = [
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."debug-2.6.9" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."node-fetch-npm-2.0.2" // {
+                dependencies = [
+                  (sources."encoding-0.1.12" // {
+                    dependencies = [
+                      sources."iconv-lite-0.4.19"
+                    ];
+                  })
+                  sources."json-parse-better-errors-1.0.1"
+                ];
+              })
+              (sources."promise-retry-1.1.1" // {
+                dependencies = [
+                  sources."err-code-1.1.2"
+                ];
+              })
+              (sources."socks-proxy-agent-3.0.1" // {
+                dependencies = [
+                  (sources."agent-base-4.1.1" // {
+                    dependencies = [
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."socks-1.1.10" // {
+                    dependencies = [
+                      sources."ip-1.1.5"
+                      sources."smart-buffer-1.1.15"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."npm-registry-client-8.5.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -8210,7 +8423,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."pacote-6.0.2" // {
+      (sources."pacote-6.0.4" // {
         dependencies = [
           (sources."make-fetch-happen-2.5.0" // {
             dependencies = [
@@ -8223,7 +8436,7 @@ in
                   })
                 ];
               })
-              sources."http-cache-semantics-3.7.3"
+              sources."http-cache-semantics-3.8.0"
               (sources."http-proxy-agent-2.0.0" // {
                 dependencies = [
                   (sources."agent-base-4.1.1" // {
@@ -8316,6 +8529,15 @@ in
       })
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
+      sources."qrcode-terminal-0.11.0"
+      (sources."query-string-5.0.0" // {
+        dependencies = [
+          sources."decode-uri-component-0.2.0"
+          sources."object-assign-4.1.1"
+          sources."strict-uri-encode-1.1.0"
+        ];
+      })
+      sources."qw-1.0.1"
       (sources."read-1.0.7" // {
         dependencies = [
           sources."mute-stream-0.0.7"
@@ -8343,9 +8565,9 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      (sources."request-2.81.0" // {
+      (sources."request-2.83.0" // {
         dependencies = [
-          sources."aws-sign2-0.6.0"
+          sources."aws-sign2-0.7.0"
           sources."aws4-1.6.0"
           sources."caseless-0.12.0"
           (sources."combined-stream-1.0.5" // {
@@ -8355,16 +8577,18 @@ in
           })
           sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.4" // {
+          (sources."form-data-2.3.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
           })
-          (sources."har-validator-4.2.1" // {
+          (sources."har-validator-5.0.3" // {
             dependencies = [
-              (sources."ajv-4.11.8" // {
+              (sources."ajv-5.2.4" // {
                 dependencies = [
                   sources."co-4.6.0"
+                  sources."fast-deep-equal-1.0.0"
+                  sources."json-schema-traverse-0.3.1"
                   (sources."json-stable-stringify-1.0.1" // {
                     dependencies = [
                       sources."jsonify-0.0.0"
@@ -8372,23 +8596,26 @@ in
                   })
                 ];
               })
-              sources."har-schema-1.0.5"
+              sources."har-schema-2.0.0"
             ];
           })
-          (sources."hawk-3.1.3" // {
+          (sources."hawk-6.0.2" // {
             dependencies = [
-              sources."hoek-2.16.3"
-              sources."boom-2.10.1"
-              sources."cryptiles-2.0.5"
-              sources."sntp-1.0.9"
+              sources."hoek-4.2.0"
+              sources."boom-4.3.1"
+              (sources."cryptiles-3.1.2" // {
+                dependencies = [
+                  sources."boom-5.2.0"
+                ];
+              })
+              sources."sntp-2.0.2"
             ];
           })
-          (sources."http-signature-1.1.1" // {
+          (sources."http-signature-1.2.0" // {
             dependencies = [
-              sources."assert-plus-0.2.0"
+              sources."assert-plus-1.0.0"
               (sources."jsprim-1.4.1" // {
                 dependencies = [
-                  sources."assert-plus-1.0.0"
                   sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
                   (sources."verror-1.10.0" // {
@@ -8401,7 +8628,6 @@ in
               (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
-                  sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
@@ -8421,8 +8647,8 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."performance-now-0.2.0"
-          sources."qs-6.4.0"
+          sources."performance-now-2.1.0"
+          sources."qs-6.5.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.3" // {
             dependencies = [
@@ -8461,10 +8687,10 @@ in
       })
       sources."ssri-4.1.6"
       sources."strip-ansi-4.0.0"
-      (sources."tar-4.0.1" // {
+      (sources."tar-4.0.2" // {
         dependencies = [
           sources."minipass-2.2.1"
-          sources."minizlib-1.0.3"
+          sources."minizlib-1.0.4"
           sources."yallist-3.0.2"
         ];
       })
@@ -8479,11 +8705,11 @@ in
       sources."unpipe-1.0.0"
       (sources."update-notifier-2.2.0" // {
         dependencies = [
-          (sources."boxen-1.2.1" // {
+          (sources."boxen-1.2.2" // {
             dependencies = [
               sources."ansi-align-2.0.0"
               sources."camelcase-4.1.0"
-              (sources."chalk-2.1.0" // {
+              (sources."chalk-2.2.0" // {
                 dependencies = [
                   (sources."ansi-styles-3.2.0" // {
                     dependencies = [
@@ -8495,7 +8721,7 @@ in
                     ];
                   })
                   sources."escape-string-regexp-1.0.5"
-                  (sources."supports-color-4.4.0" // {
+                  (sources."supports-color-4.5.0" // {
                     dependencies = [
                       sources."has-flag-2.0.0"
                     ];
@@ -8580,9 +8806,9 @@ in
                   sources."is-obj-1.0.1"
                 ];
               })
-              (sources."make-dir-1.0.0" // {
+              (sources."make-dir-1.1.0" // {
                 dependencies = [
-                  sources."pify-2.3.0"
+                  sources."pify-3.0.0"
                 ];
               })
               (sources."unique-string-1.0.0" // {
@@ -8622,7 +8848,7 @@ in
                   })
                   (sources."registry-auth-token-3.3.1" // {
                     dependencies = [
-                      (sources."rc-1.2.1" // {
+                      (sources."rc-1.2.2" // {
                         dependencies = [
                           sources."deep-extend-0.4.2"
                           sources."minimist-1.2.0"
@@ -8633,7 +8859,7 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.2.1" // {
+                      (sources."rc-1.2.2" // {
                         dependencies = [
                           sources."deep-extend-0.4.2"
                           sources."minimist-1.2.0"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 192df9f87fc..7ea7ce2d3ed 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -82,6 +82,7 @@
 , "ungit"
 , "webdrvr"
 , "webpack"
+, "web-ext"
 , "wring"
 , "yarn"
 , "yo"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index bd4a3e5abcc..ebf116fed73 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -310,13 +310,13 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
-    "private-0.1.7" = {
+    "private-0.1.8" = {
       name = "private";
       packageName = "private";
-      version = "0.1.7";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
-        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
+        sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n";
       };
     };
     "slash-1.0.0" = {
@@ -1390,31 +1390,31 @@ let
         sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21";
       };
     };
-    "moment-2.18.1" = {
+    "moment-2.19.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.18.1";
+      version = "2.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
-        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz";
+        sha1 = "56da1a2d1cbf01d38b7e1afc31c10bcfa1929167";
       };
     };
-    "ms-rest-2.2.2" = {
+    "ms-rest-2.2.3" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.2.tgz";
-        sha1 = "be191c4fbdff2e208bda440933436af80e7425b9";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.3.tgz";
+        sha1 = "f4f244de6282d9644504a50d11ac7f7cfb01b867";
       };
     };
-    "ms-rest-azure-2.3.3" = {
+    "ms-rest-azure-2.4.1" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.3.3";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.3.tgz";
-        sha1 = "99016e430fb70a4e936191d3b35fc8b91327b337";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.1.tgz";
+        sha1 = "0d5501449a3318c0cf5e10d4bb0494977989b967";
       };
     };
     "node-forge-0.6.23" = {
@@ -2020,31 +2020,31 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-8.0.30" = {
+    "@types/node-8.0.46" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "8.0.30";
+      version = "8.0.46";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.0.30.tgz";
-        sha512 = "0y4jg8faga3jb33fjpyyriyg7r1cpp1cjm0nc6pjixm96naqmxnhq7bkxfm8489rdcifw6mc265a933cyihwdb9n88xhyynf0djv911";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.0.46.tgz";
+        sha512 = "0bmyn8y1ifdybpbvvr9r1m473d789767c3yc5vj96jh2na04a4mbf7abvgkrq9cly0390sf6dql3xklvhv6hjl408gq49gr8vi0y6dd";
       };
     };
-    "@types/request-2.0.3" = {
+    "@types/request-2.0.6" = {
       name = "@types/request";
       packageName = "@types/request";
-      version = "2.0.3";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.0.3.tgz";
-        sha512 = "3q87vjfkg7p6mwr6yn9y7f6c87klvd81wqi7vq86cn5cvfd4j3i1pvykjc1qhp4jmggl54a2r5zxcbv5qk0psg1w021qis0ak4fg2vh";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.0.6.tgz";
+        sha512 = "13hi2wdyaa8iypfbfhf051n1jjbkqzywy7sh2hy1w605q5jy2hfc0sr684jpxa7hwfigck8n5gv72f9icb9m31k866nny90r69l1xgk";
       };
     };
-    "@types/uuid-3.4.2" = {
+    "@types/uuid-3.4.3" = {
       name = "@types/uuid";
       packageName = "@types/uuid";
-      version = "3.4.2";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.2.tgz";
-        sha512 = "2k89p1xsllidfwgic0qklzdp1lpvyzw22z7xlphii062jm6rh58xajz11r4lby49kghc5zrmmqrsi1mkmzm6ix8x3rhcrj1rnixhykx";
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz";
+        sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75";
       };
     };
     "is-buffer-1.1.5" = {
@@ -2065,6 +2065,15 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
+    "moment-2.18.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.18.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
+        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
+      };
+    };
     "@types/form-data-2.2.0" = {
       name = "@types/form-data";
       packageName = "@types/form-data";
@@ -2146,13 +2155,13 @@ let
         sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
       };
     };
-    "i-0.3.5" = {
+    "i-0.3.6" = {
       name = "i";
       packageName = "i";
-      version = "0.3.5";
+      version = "0.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz";
-        sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5";
+        url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz";
+        sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
     "ncp-0.4.2" = {
@@ -3397,13 +3406,13 @@ let
         sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
-    "q-1.5.0" = {
+    "q-1.5.1" = {
       name = "q";
       packageName = "q";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz";
-        sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1";
+        url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz";
+        sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7";
       };
     };
     "rimraf-2.2.8" = {
@@ -3451,22 +3460,22 @@ let
         sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
       };
     };
-    "browserify-zlib-0.1.4" = {
+    "browserify-zlib-0.2.0" = {
       name = "browserify-zlib";
       packageName = "browserify-zlib";
-      version = "0.1.4";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
-        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
       };
     };
-    "buffer-5.0.7" = {
+    "buffer-5.0.8" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.7";
+      version = "5.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz";
-        sha512 = "2p32xxvhb1b3dp3hjy1ga0iajddqfxqi25wx44lhd94jjry1g758zywadx6hq04c8zsrcnmjyjrlymxrfmgyxib837jd93rd1fqgrrm";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz";
+        sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3613,13 +3622,13 @@ let
         sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd";
       };
     };
-    "os-browserify-0.1.2" = {
+    "os-browserify-0.3.0" = {
       name = "os-browserify";
       packageName = "os-browserify";
-      version = "0.1.2";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
-        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz";
+        sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
       };
     };
     "parents-1.0.1" = {
@@ -3847,13 +3856,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "pako-0.2.9" = {
+    "pako-1.0.6" = {
       name = "pako";
       packageName = "pako";
-      version = "0.2.9";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
-        sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
+        sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm";
       };
     };
     "base64-js-1.2.1" = {
@@ -3964,13 +3973,13 @@ let
         sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi";
       };
     };
-    "browserify-aes-1.0.8" = {
+    "browserify-aes-1.1.1" = {
       name = "browserify-aes";
       packageName = "browserify-aes";
-      version = "1.0.8";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz";
-        sha512 = "1skrqw93dd41n99j90srrpzd0rkcb144xl1m4f420fz0cj1p6f34fnznlr7ymiby1yj8b595qziqmi433fqd1g2lkjn9d6g7wwqr02r";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz";
+        sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah";
       };
     };
     "browserify-des-1.0.0" = {
@@ -4117,13 +4126,13 @@ let
         sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
       };
     };
-    "sha.js-2.4.8" = {
+    "sha.js-2.4.9" = {
       name = "sha.js";
       packageName = "sha.js";
-      version = "2.4.8";
+      version = "2.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
-        sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz";
+        sha512 = "3l96mlw71zgkmfm9madd3jcndrpm2fm4jz2q5gz9mbm27mdg89hsbrg22pfl32ha76xa3pza83m2mc3b47pnq19mz3j6vkasn9dxk0v";
       };
     };
     "hash-base-2.0.2" = {
@@ -4135,13 +4144,13 @@ let
         sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
       };
     };
-    "miller-rabin-4.0.0" = {
+    "miller-rabin-4.0.1" = {
       name = "miller-rabin";
       packageName = "miller-rabin";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz";
-        sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
+        url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
+        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
       };
     };
     "function-bind-1.1.1" = {
@@ -4405,13 +4414,13 @@ let
         sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "mime-1.4.0" = {
+    "mime-1.4.1" = {
       name = "mime";
       packageName = "mime";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz";
-        sha512 = "14lm9narafxlaar57v4mv7qqgg0v56isjyb3kxmbgj0p1zcrjwj9qz6im8nzwvr16vga071f5dl11mcgraz4cwnd8209ygvzqpa3l4z";
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
       };
     };
     "peerflix-0.34.0" = {
@@ -5557,13 +5566,13 @@ let
         sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61";
       };
     };
-    "ipaddr.js-1.5.2" = {
+    "ipaddr.js-1.5.4" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.5.2";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz";
-        sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz";
+        sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14";
       };
     };
     "get-browser-rtc-1.0.2" = {
@@ -5935,22 +5944,22 @@ let
         sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
       };
     };
-    "cordova-common-2.0.3" = {
+    "cordova-common-2.1.1" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "2.0.3";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz";
-        sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.1.tgz";
+        sha1 = "e3a16a4f3d29a8e2b523128ac65478aca9ea1749";
       };
     };
-    "cordova-lib-7.0.1" = {
+    "cordova-lib-7.1.0" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "7.0.1";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.0.1.tgz";
-        sha1 = "31cbb90daeb66a67a7d3091636ce729a22a4f7ff";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.1.0.tgz";
+        sha1 = "f15aa0eda0e06e8c7e423a218404d59ec50f8594";
       };
     };
     "editor-1.0.0" = {
@@ -6205,31 +6214,31 @@ let
         sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2";
       };
     };
-    "cordova-fetch-1.1.0" = {
+    "cordova-fetch-1.2.0" = {
       name = "cordova-fetch";
       packageName = "cordova-fetch";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz";
-        sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54";
+        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.2.0.tgz";
+        sha1 = "e32ea33f5834d68585a3f4946295c3ffe71f8060";
       };
     };
-    "cordova-js-4.2.1" = {
+    "cordova-js-4.2.2" = {
       name = "cordova-js";
       packageName = "cordova-js";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz";
-        sha1 = "01ca186e14e63b01cb6d24e469750e481a038355";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz";
+        sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92";
       };
     };
-    "cordova-serve-1.0.1" = {
+    "cordova-serve-2.0.0" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
-        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz";
+        sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43";
       };
     };
     "dep-graph-1.1.0" = {
@@ -6313,15 +6322,6 @@ let
         sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
-    "semver-5.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
-      };
-    };
     "shelljs-0.3.0" = {
       name = "shelljs";
       packageName = "shelljs";
@@ -6412,6 +6412,24 @@ let
         sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f";
       };
     };
+    "cordova-common-2.0.3" = {
+      name = "cordova-common";
+      packageName = "cordova-common";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz";
+        sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38";
+      };
+    };
+    "cordova-fetch-1.1.0" = {
+      name = "cordova-fetch";
+      packageName = "cordova-fetch";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz";
+        sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54";
+      };
+    };
     "dependency-ls-1.1.1" = {
       name = "dependency-ls";
       packageName = "dependency-ls";
@@ -6466,49 +6484,58 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "browserify-13.3.0" = {
+    "browserify-14.4.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "13.3.0";
+      version = "14.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-        sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+        url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz";
+        sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9";
       };
     };
-    "buffer-4.9.1" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "4.9.1";
+    "browserify-zlib-0.1.4" = {
+      name = "browserify-zlib";
+      packageName = "browserify-zlib";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "https-browserify-0.0.1" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.1";
+    "os-browserify-0.1.2" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
-        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
+        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
       };
     };
-    "compression-1.7.0" = {
+    "pako-0.2.9" = {
+      name = "pako";
+      packageName = "pako";
+      version = "0.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
+        sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
+      };
+    };
+    "compression-1.7.1" = {
       name = "compression";
       packageName = "compression";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz";
-        sha1 = "030c9f198f1643a057d776a738e922da4373012d";
+        url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz";
+        sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db";
       };
     };
-    "express-4.15.4" = {
+    "express-4.16.2" = {
       name = "express";
       packageName = "express";
-      version = "4.15.4";
+      version = "4.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz";
-        sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1";
+        url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz";
+        sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c";
       };
     };
     "accepts-1.3.4" = {
@@ -6520,31 +6547,22 @@ let
         sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f";
       };
     };
-    "bytes-2.5.0" = {
+    "bytes-3.0.0" = {
       name = "bytes";
       packageName = "bytes";
-      version = "2.5.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
-        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
+        url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
-    "compressible-2.0.11" = {
+    "compressible-2.0.12" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz";
-        sha1 = "16718a75de283ed8e604041625a2064586797d8a";
-      };
-    };
-    "debug-2.6.8" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
-        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz";
+        sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66";
       };
     };
     "on-headers-1.0.1" = {
@@ -6556,13 +6574,13 @@ let
         sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
       };
     };
-    "vary-1.1.1" = {
+    "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz";
-        sha1 = "67535ebb694c1d52257457984665323f587e8d37";
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
       };
     };
     "negotiator-0.6.1" = {
@@ -6583,6 +6601,15 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
+    "body-parser-1.18.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.18.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+      };
+    };
     "content-disposition-0.5.2" = {
       name = "content-disposition";
       packageName = "content-disposition";
@@ -6655,22 +6682,22 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "finalhandler-1.0.6" = {
+    "finalhandler-1.1.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.6";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz";
-        sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz";
+        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
       };
     };
-    "fresh-0.5.0" = {
+    "fresh-0.5.2" = {
       name = "fresh";
       packageName = "fresh";
-      version = "0.5.0";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz";
-        sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -6718,49 +6745,49 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.5" = {
+    "proxy-addr-2.0.2" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.5";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz";
-        sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz";
+        sha1 = "6571504f47bb988ec8180253f85dd7e14952bdec";
       };
     };
-    "qs-6.5.0" = {
+    "qs-6.5.1" = {
       name = "qs";
       packageName = "qs";
-      version = "6.5.0";
+      version = "6.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
+        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
       };
     };
-    "send-0.15.4" = {
+    "send-0.16.1" = {
       name = "send";
       packageName = "send";
-      version = "0.15.4";
+      version = "0.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz";
-        sha1 = "985faa3e284b0273c793364a35c6737bd93905b9";
+        url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz";
+        sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j";
       };
     };
-    "serve-static-1.12.4" = {
+    "serve-static-1.13.1" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.4";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz";
-        sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz";
+        sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5";
       };
     };
-    "setprototypeof-1.0.3" = {
+    "setprototypeof-1.1.0" = {
       name = "setprototypeof";
       packageName = "setprototypeof";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
-        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
       };
     };
     "statuses-1.3.1" = {
@@ -6781,13 +6808,49 @@ let
         sha1 = "cab10fb4909e441c82842eafe1ad646c81804410";
       };
     };
-    "utils-merge-1.0.0" = {
+    "utils-merge-1.0.1" = {
       name = "utils-merge";
       packageName = "utils-merge";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    };
+    "http-errors-1.6.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    };
+    "iconv-lite-0.4.19" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+      };
+    };
+    "raw-body-2.3.2" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz";
+        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+      };
+    };
+    "setprototypeof-1.0.3" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
       };
     };
     "unpipe-1.0.0" = {
@@ -6817,13 +6880,13 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "ipaddr.js-1.4.0" = {
+    "ipaddr.js-1.5.2" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.4.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
-        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz";
+        sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0";
       };
     };
     "destroy-1.0.4" = {
@@ -6835,24 +6898,6 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.6.2" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
-        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
-      };
-    };
-    "mime-1.3.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
-      };
-    };
     "media-typer-0.3.0" = {
       name = "media-typer";
       packageName = "media-typer";
@@ -6925,13 +6970,13 @@ let
         sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
       };
     };
-    "abbrev-1.1.0" = {
+    "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
-        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
     "abbrev-1.0.9" = {
@@ -7402,6 +7447,15 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
+    "semver-5.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    };
     "npm-package-arg-4.2.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -7951,13 +8005,13 @@ let
         sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
       };
     };
-    "rc-1.2.1" = {
+    "rc-1.2.2" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz";
-        sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz";
+        sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -8312,6 +8366,15 @@ let
         sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
       };
     };
+    "utils-merge-1.0.0" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+      };
+    };
     "negotiator-0.5.3" = {
       name = "negotiator";
       packageName = "negotiator";
@@ -8465,13 +8528,13 @@ let
         sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb";
       };
     };
-    "http-parser-js-0.4.8" = {
+    "http-parser-js-0.4.9" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.8";
+      version = "0.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz";
-        sha512 = "26g8b2fsa644qxadhgjjwlmzmik345a543f8rlg842j8l7g0sz8vhbf7vsxz047hk6qw0c7a1rfq222xjn2ckclsbqz5z9sv3vyjqcf";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz";
+        sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1";
       };
     };
     "websocket-extensions-0.1.2" = {
@@ -9080,13 +9143,13 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
-    "split2-2.1.1" = {
+    "split2-2.2.0" = {
       name = "split2";
       packageName = "split2";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
-        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
+        url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz";
+        sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4";
       };
     };
     "murl-0.4.1" = {
@@ -9116,22 +9179,31 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.122.0" = {
+    "aws-sdk-2.138.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.122.0";
+      version = "2.138.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.122.0.tgz";
-        sha1 = "d40980fdb24a07db166de91cb8813f0dc640d7c6";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.138.0.tgz";
+        sha1 = "acb923132b51fafe8a464aa757f65d61ac30bd77";
       };
     };
-    "request-2.82.0" = {
+    "request-2.83.0" = {
       name = "request";
       packageName = "request";
-      version = "2.82.0";
+      version = "2.83.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz";
-        sha512 = "079947pnxi0h8jdiv5wb64rj3gnq4a02dfj47c41wsdi3g6pp1v3yfg3m1rphib7igf6vkisrgjq16vc4fq916fc870wzckdizal1gx";
+        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
+        sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
+      };
+    };
+    "buffer-4.9.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
     "crypto-browserify-1.0.9" = {
@@ -9251,15 +9323,6 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "qs-6.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
-      };
-    };
     "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -9269,13 +9332,13 @@ let
         sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
-    "ajv-5.2.2" = {
+    "ajv-5.2.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.2.2";
+      version = "5.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
-        sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz";
+        sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b";
       };
     };
     "har-schema-2.0.0" = {
@@ -9386,13 +9449,13 @@ let
         sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee";
       };
     };
-    "conf-1.3.0" = {
+    "conf-1.3.1" = {
       name = "conf";
       packageName = "conf";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conf/-/conf-1.3.0.tgz";
-        sha512 = "21wa83v253mikyav1r639cnmycyribfhr6d4kzmzhgcs8l1ahn6mb37lmr3wnzjrca53f52w30p5ccxhm58zh1lmr01naf0kb3fc2qh";
+        url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz";
+        sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8";
       };
     };
     "got-7.1.0" = {
@@ -9575,13 +9638,13 @@ let
         sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
       };
     };
-    "make-dir-1.0.0" = {
+    "make-dir-1.1.0" = {
       name = "make-dir";
       packageName = "make-dir";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz";
-        sha1 = "97a011751e91dd87cfadef58832ebb04936de978";
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz";
+        sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh";
       };
     };
     "pkg-up-2.0.0" = {
@@ -9602,6 +9665,15 @@ let
         sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
       };
     };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
     "find-up-2.1.0" = {
       name = "find-up";
       packageName = "find-up";
@@ -9863,13 +9935,13 @@ let
         sha1 = "898508da2226f380df904728456849c1501a4b0d";
       };
     };
-    "chalk-2.1.0" = {
+    "chalk-2.2.0" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz";
+        sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh";
       };
     };
     "indent-string-3.2.0" = {
@@ -9899,22 +9971,22 @@ let
         sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "log-update-2.1.0" = {
+    "log-update-2.2.0" = {
       name = "log-update";
       packageName = "log-update";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-2.1.0.tgz";
-        sha1 = "ea37258b5354edb02e73b29190016c87d1c87141";
+        url = "https://registry.npmjs.org/log-update/-/log-update-2.2.0.tgz";
+        sha1 = "e1b034d4325e3436c9df1aa7fd9c9c243bfb9198";
       };
     };
-    "prop-types-15.5.10" = {
+    "prop-types-15.6.0" = {
       name = "prop-types";
       packageName = "prop-types";
-      version = "15.5.10";
+      version = "15.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz";
-        sha1 = "2797dfc3126182e3a95e3dfbb2e893ddd7456154";
+        url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz";
+        sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856";
       };
     };
     "ansi-styles-3.2.0" = {
@@ -9926,13 +9998,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.4.0" = {
+    "supports-color-4.5.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
-        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz";
+        sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
       };
     };
     "color-convert-1.9.0" = {
@@ -9962,13 +10034,13 @@ let
         sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
       };
     };
-    "ansi-escapes-2.0.0" = {
+    "ansi-escapes-3.0.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz";
-        sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b";
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz";
+        sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v";
       };
     };
     "cli-cursor-2.1.0" = {
@@ -10043,13 +10115,13 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
-    "fbjs-0.8.15" = {
+    "fbjs-0.8.16" = {
       name = "fbjs";
       packageName = "fbjs";
-      version = "0.8.15";
+      version = "0.8.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.15.tgz";
-        sha1 = "4f0695fdfcc16c37c0b07facec8cb4c4091685b9";
+        url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz";
+        sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db";
       };
     };
     "core-js-1.2.7" = {
@@ -10079,13 +10151,13 @@ let
         sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
-    "ua-parser-js-0.7.14" = {
+    "ua-parser-js-0.7.17" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.14";
+      version = "0.7.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz";
-        sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz";
+        sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr";
       };
     };
     "node-fetch-1.7.3" = {
@@ -10115,15 +10187,6 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "iconv-lite-0.4.19" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
-        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
-      };
-    };
     "unicode-emoji-modifier-base-1.0.0" = {
       name = "unicode-emoji-modifier-base";
       packageName = "unicode-emoji-modifier-base";
@@ -10133,13 +10196,13 @@ let
         sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459";
       };
     };
-    "debug-3.0.1" = {
+    "debug-3.1.0" = {
       name = "debug";
       packageName = "debug";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz";
-        sha512 = "3rnqa9m5ma6whhiailgppfhnm4gkv4brw9619yvxz59di3g306svl7na9qj6n9l887ra3fgr80b0xij0vjvfwpbk9zvpags5plmqxga";
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
       };
     };
     "doctrine-2.0.0" = {
@@ -10205,13 +10268,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "ignore-3.3.5" = {
+    "ignore-3.3.6" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.5";
+      version = "3.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz";
-        sha512 = "07qdg1b3fwg8b7zwq83rljcx2h0ybq8s43h5xkvsr252qij7ib2gcjamqsb25zv1nvxm94yrvf4fl41s1kyms8zhr86cspwcbggvc94";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz";
+        sha512 = "2bv6fgfnwzivrdak4qc7bxfydydg6qqv9nynyqc9bpj2fq57m5ac4asylrl5m5n67nq8bxx86vrv97b8r9zq9g0vrd9y6ck28vndg0y";
       };
     };
     "inquirer-3.3.0" = {
@@ -10295,13 +10358,13 @@ let
         sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
       };
     };
-    "table-4.0.1" = {
+    "table-4.0.2" = {
       name = "table";
       packageName = "table";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-4.0.1.tgz";
-        sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435";
+        url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz";
+        sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai";
       };
     };
     "esrecurse-4.2.0" = {
@@ -10331,13 +10394,13 @@ let
         sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
       };
     };
-    "flat-cache-1.2.2" = {
+    "flat-cache-1.3.0" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.2";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
-        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz";
+        sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481";
       };
     };
     "circular-json-0.3.3" = {
@@ -10421,15 +10484,6 @@ let
         sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
       };
     };
-    "ansi-escapes-3.0.0" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz";
-        sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v";
-      };
-    };
     "cli-width-2.2.0" = {
       name = "cli-width";
       packageName = "cli-width";
@@ -10610,40 +10664,31 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
-      };
-    };
-    "ajv-keywords-1.5.1" = {
+    "ajv-keywords-2.1.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.5.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
-        sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz";
+        sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0";
       };
     };
-    "slice-ansi-0.0.4" = {
+    "slice-ansi-1.0.0" = {
       name = "slice-ansi";
       packageName = "slice-ansi";
-      version = "0.0.4";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz";
-        sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
+        sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
-    "eslint-4.7.2" = {
+    "eslint-4.9.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.7.2";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz";
-        sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz";
+        sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b";
       };
     };
     "supports-color-3.2.3" = {
@@ -10664,15 +10709,6 @@ let
         sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
       };
     };
-    "log-update-1.0.2" = {
-      name = "log-update";
-      packageName = "log-update";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
-        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
-      };
-    };
     "ora-1.3.0" = {
       name = "ora";
       packageName = "ora";
@@ -10682,22 +10718,13 @@ let
         sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a";
       };
     };
-    "phantomjs-prebuilt-2.1.15" = {
-      name = "phantomjs-prebuilt";
-      packageName = "phantomjs-prebuilt";
-      version = "2.1.15";
+    "puppeteer-0.11.0" = {
+      name = "puppeteer";
+      packageName = "puppeteer";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz";
-        sha1 = "20f86e82d3349c505917527745b7a411e08b3903";
-      };
-    };
-    "promise-phantom-3.1.6" = {
-      name = "promise-phantom";
-      packageName = "promise-phantom";
-      version = "3.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz";
-        sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-0.11.0.tgz";
+        sha512 = "3rfwg87lk6wc7vyansvzg9qpxlkix62l5mway31pxflgcadf475n8zm866gbcq7wxyffy0nx4hrlkhd1fchbn2i0zw6x122lmijx3zy";
       };
     };
     "zen-observable-0.5.2" = {
@@ -10709,13 +10736,13 @@ let
         sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
       };
     };
-    "cli-spinners-1.0.1" = {
+    "cli-spinners-1.1.0" = {
       name = "cli-spinners";
       packageName = "cli-spinners";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.1.tgz";
-        sha1 = "2675321c100f195b02877ac499e9911fa34b9783";
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz";
+        sha1 = "f1847b168844d917a671eb9d147e3df497c90d06";
       };
     };
     "log-symbols-1.0.2" = {
@@ -10727,15 +10754,6 @@ let
         sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
       };
     };
-    "es6-promise-4.0.5" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz";
-        sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42";
-      };
-    };
     "extract-zip-1.6.5" = {
       name = "extract-zip";
       packageName = "extract-zip";
@@ -10745,49 +10763,31 @@ let
         sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440";
       };
     };
-    "fs-extra-1.0.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
+    "https-proxy-agent-2.1.0" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
+        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
+      };
+    };
+    "proxy-from-env-1.0.0" = {
+      name = "proxy-from-env";
+      packageName = "proxy-from-env";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+        url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz";
+        sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee";
       };
     };
-    "hasha-2.2.0" = {
-      name = "hasha";
-      packageName = "hasha";
-      version = "2.2.0";
+    "ws-3.2.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
-        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
-      };
-    };
-    "kew-0.7.0" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
-        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
-      };
-    };
-    "request-2.81.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.81.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
-      };
-    };
-    "request-progress-2.0.1" = {
-      name = "request-progress";
-      packageName = "request-progress";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
-        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+        url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz";
+        sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45";
       };
     };
     "debug-2.2.0" = {
@@ -10844,76 +10844,40 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
-    "har-validator-4.2.1" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "4.2.1";
+    "agent-base-4.1.1" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
+        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
       };
     };
-    "performance-now-0.2.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "0.2.0";
+    "es6-promisify-5.0.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
       };
     };
-    "qs-6.4.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.4.0";
+    "es6-promise-4.1.1" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
       };
     };
-    "har-schema-1.0.5" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
-      };
-    };
-    "throttleit-1.0.0" = {
-      name = "throttleit";
-      packageName = "throttleit";
+    "async-limiter-1.0.0" = {
+      name = "async-limiter";
+      packageName = "async-limiter";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
-        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
-      };
-    };
-    "mkpath-1.0.0" = {
-      name = "mkpath";
-      packageName = "mkpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz";
-        sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
-      };
-    };
-    "node-phantom-simple-2.2.4" = {
-      name = "node-phantom-simple";
-      packageName = "node-phantom-simple";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz";
-        sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
-      };
-    };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf";
       };
     };
     "glob-3.2.11" = {
@@ -11465,6 +11429,15 @@ let
         sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
     "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
@@ -11528,6 +11501,51 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
     "event-stream-0.5.3" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -11618,22 +11636,22 @@ let
         sha1 = "0b08a1dcf68397c397855c3239783832df7403d1";
       };
     };
-    "minilog-2.0.8" = {
+    "minilog-3.1.0" = {
       name = "minilog";
       packageName = "minilog";
-      version = "2.0.8";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz";
-        sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
+        url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz";
+        sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675";
       };
     };
-    "simple-git-1.77.0" = {
+    "simple-git-1.80.1" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.77.0";
+      version = "1.80.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.77.0.tgz";
-        sha1 = "526537470b946e5f6f93d103ef54b46949600939";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz";
+        sha1 = "48104cb4ac72576937853e1afd1eeffdc97acb29";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -11646,13 +11664,13 @@ let
         sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
       };
     };
-    "microee-0.0.2" = {
+    "microee-0.0.6" = {
       name = "microee";
       packageName = "microee";
-      version = "0.0.2";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
-        sha1 = "72e80d477075e5e799470f5defea96d1dd121587";
+        url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz";
+        sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe";
       };
     };
     "findup-sync-0.3.0" = {
@@ -12987,22 +13005,22 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "@ionic/cli-utils-1.12.0" = {
+    "@ionic/cli-utils-1.13.1" = {
       name = "@ionic/cli-utils";
       packageName = "@ionic/cli-utils";
-      version = "1.12.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.12.0.tgz";
-        sha512 = "15fk5kfp3wsi3yjpdj2hybb45g6i4i8xjadianbjlcfy8jh3zn4riavafawy76jwbn7i72yzd2yq9mwzimzqgypgpnyi254mwlykgrp";
+        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz";
+        sha512 = "0smk0gdbf976vrvp6n8yvcp1idyh5gp16810wyafah3hx4zgrmw3ni0xnq0a0m1lq914b9c5cfcw8hr5m94fb54381r62r684kr7b5g";
       };
     };
-    "@ionic/discover-0.3.1" = {
+    "@ionic/discover-0.3.3" = {
       name = "@ionic/discover";
       packageName = "@ionic/discover";
-      version = "0.3.1";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.1.tgz";
-        sha512 = "35246ajg70xdrv5r5ln20m3b3h8gqa7gvmcraalmr5nk7pkmrldfr8cyscm9zrqpzpsjbbs2h2vdy0nh0ghlnyhiywry8ivxn7agk90";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz";
+        sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65";
       };
     };
     "opn-5.1.0" = {
@@ -13023,31 +13041,22 @@ let
         sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e";
       };
     };
-    "tslib-1.7.1" = {
+    "tslib-1.8.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.7.1";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz";
-        sha1 = "bc8004164691923a79fe8378bbeb3da2017538ec";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz";
+        sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna";
       };
     };
-    "archiver-2.0.3" = {
+    "archiver-2.1.0" = {
       name = "archiver";
       packageName = "archiver";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/archiver/-/archiver-2.0.3.tgz";
-        sha1 = "b4360bb584af1437991942716f21d7c523d1dbbd";
-      };
-    };
-    "body-parser-1.18.2" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.18.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz";
-        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+        url = "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz";
+        sha1 = "d2df2e8d5773a82c1dcce925ccc41450ea999afd";
       };
     };
     "ci-info-1.1.1" = {
@@ -13068,13 +13077,13 @@ let
         sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829";
       };
     };
-    "diff-3.3.1" = {
+    "diff-3.4.0" = {
       name = "diff";
       packageName = "diff";
-      version = "3.3.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz";
-        sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh";
+        url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz";
+        sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2";
       };
     };
     "elementtree-0.1.7" = {
@@ -13113,31 +13122,22 @@ let
         sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
       };
     };
-    "slice-ansi-1.0.0" = {
-      name = "slice-ansi";
-      packageName = "slice-ansi";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
-        sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
-      };
-    };
-    "ssh-config-1.1.2" = {
+    "ssh-config-1.1.3" = {
       name = "ssh-config";
       packageName = "ssh-config";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.2.tgz";
-        sha1 = "ae65590f276b8e259ec814551f7667c141f817e9";
+        url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz";
+        sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c";
       };
     };
-    "superagent-3.6.0" = {
+    "superagent-3.7.0" = {
       name = "superagent";
       packageName = "superagent";
-      version = "3.6.0";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz";
-        sha512 = "3n51bpsm3bf5x3z8jf9ylnffxgyrfwgi2v5ii78d1vgzs5f2km3928pcqzw2j331q4y19dj96npb134f2ry2ad8qlawp8z8cvi2wsx1";
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz";
+        sha512 = "0dv80576bgsb7mq2mh3f0jgik6wnrki1ml5n8c2r21g4ql72z683fn7v63bxkf20s9ihh39gr1sqaadhpkj3yvnc5wbqv4dxv26pjzz";
       };
     };
     "tiny-lr-1.0.5" = {
@@ -13149,15 +13149,6 @@ let
         sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32";
       };
     };
-    "ws-3.2.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-3.2.0.tgz";
-        sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45";
-      };
-    };
     "archiver-utils-1.3.0" = {
       name = "archiver-utils";
       packageName = "archiver-utils";
@@ -13185,15 +13176,6 @@ let
         sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04";
       };
     };
-    "walkdir-0.0.11" = {
-      name = "walkdir";
-      packageName = "walkdir";
-      version = "0.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz";
-        sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532";
-      };
-    };
     "lazystream-1.0.0" = {
       name = "lazystream";
       packageName = "lazystream";
@@ -13203,13 +13185,13 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "compress-commons-1.2.0" = {
+    "compress-commons-1.2.2" = {
       name = "compress-commons";
       packageName = "compress-commons";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz";
-        sha1 = "58587092ef20d37cb58baf000112c9278ff73b9f";
+        url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz";
+        sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
       };
     };
     "crc32-stream-2.0.0" = {
@@ -13221,31 +13203,22 @@ let
         sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
       };
     };
-    "crc-3.4.4" = {
+    "crc-3.5.0" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.4";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
-        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
+        url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz";
+        sha1 = "98b8ba7d489665ba3979f59b21381374101a1964";
       };
     };
-    "bytes-3.0.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "3.0.0";
+    "statuses-1.4.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
-        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
-      };
-    };
-    "raw-body-2.3.2" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz";
-        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
+        sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f";
       };
     };
     "sax-1.1.4" = {
@@ -13410,15 +13383,6 @@ let
         sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       };
     };
-    "async-limiter-1.0.0" = {
-      name = "async-limiter";
-      packageName = "async-limiter";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf";
-      };
-    };
     "netmask-1.0.6" = {
       name = "netmask";
       packageName = "netmask";
@@ -13464,13 +13428,13 @@ let
         sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
       };
     };
-    "handlebars-4.0.10" = {
+    "handlebars-4.0.11" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.0.10";
+      version = "4.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz";
-        sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz";
+        sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
       };
     };
     "estraverse-1.9.3" = {
@@ -13491,13 +13455,13 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
-    "@reactivex/rxjs-5.4.3" = {
+    "@reactivex/rxjs-5.5.0" = {
       name = "@reactivex/rxjs";
       packageName = "@reactivex/rxjs";
-      version = "5.4.3";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz";
-        sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm";
+        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.5.0.tgz";
+        sha512 = "3r28zxbg2644s5bc09s7bjngpgs5ws56r4j5vq7sk370zyl8vppri090phfblsmqnpv5y1hfb6qlb8j19mb8i2qzqvyqyzx98xd10jr";
       };
     };
     "chai-4.1.2" = {
@@ -13518,13 +13482,13 @@ let
         sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb";
       };
     };
-    "fast-json-patch-2.0.5" = {
+    "fast-json-patch-2.0.6" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.5.tgz";
-        sha1 = "a712e829be69ab707514440c5404bdd9b0d3c609";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz";
+        sha1 = "86fff8f8662391aa819722864d632e603e6ee605";
       };
     };
     "iterare-0.0.8" = {
@@ -13554,13 +13518,13 @@ let
         sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg";
       };
     };
-    "object-hash-1.1.8" = {
+    "object-hash-1.2.0" = {
       name = "object-hash";
       packageName = "object-hash";
-      version = "1.1.8";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz";
-        sha1 = "28a659cf987d96a4dabe7860289f3b5326c4a03c";
+        url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz";
+        sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j";
       };
     };
     "opentracing-0.14.1" = {
@@ -13590,22 +13554,22 @@ let
         sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30";
       };
     };
-    "typescript-2.3.4" = {
+    "typescript-2.4.2" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.3.4";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz";
-        sha1 = "3d38321828231e434f287514959c37a82b629f42";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz";
+        sha1 = "f8395f85d459276067c988aa41837a8f82870844";
       };
     };
-    "vscode-jsonrpc-3.4.0" = {
+    "vscode-jsonrpc-3.4.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.0.tgz";
-        sha1 = "aa95ac583bf31d80f725d57c27c09f4c2cfe9fa9";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.1.tgz";
+        sha1 = "e2e0b9e121f71a2b5448058a34a3aef8376a5e91";
       };
     };
     "vscode-languageserver-3.4.3" = {
@@ -13779,13 +13743,13 @@ let
         sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8";
       };
     };
-    "vscode-languageserver-protocol-3.4.2" = {
+    "vscode-languageserver-protocol-3.4.4" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.4.2";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.2.tgz";
-        sha512 = "1vm846vq0y63gjxgjnng6zd4196yjx212rmzjr1ljwmkrgb2f1llgpc13ly1b1zsg6v1zjzj473i0dql50sykxwm5vdzaavl28knl6r";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.4.tgz";
+        sha1 = "0387bb49bd0f805e9048c695997dbd430d6eca28";
       };
     };
     "when-3.4.6" = {
@@ -13815,13 +13779,13 @@ let
         sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
       };
     };
-    "bluebird-3.5.0" = {
+    "bluebird-3.5.1" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
-        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
+        sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h";
       };
     };
     "lru-cache-3.2.0" = {
@@ -13851,13 +13815,13 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "path-loader-1.0.2" = {
+    "path-loader-1.0.4" = {
       name = "path-loader";
       packageName = "path-loader";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.2.tgz";
-        sha1 = "cd5c73e7e39a91011be148d6bfdd8a85bb931ef9";
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz";
+        sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk";
       };
     };
     "uri-js-3.0.2" = {
@@ -13932,22 +13896,22 @@ let
         sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96";
       };
     };
-    "method-override-2.3.9" = {
+    "method-override-2.3.10" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.9";
+      version = "2.3.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz";
-        sha1 = "bd151f2ce34cf01a76ca400ab95c012b102d8f71";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz";
+        sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4";
       };
     };
-    "morgan-1.8.2" = {
+    "morgan-1.9.0" = {
       name = "morgan";
       packageName = "morgan";
-      version = "1.8.2";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz";
-        sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687";
+        url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz";
+        sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051";
       };
     };
     "please-upgrade-node-3.0.1" = {
@@ -14031,6 +13995,15 @@ let
         sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb";
       };
     };
+    "basic-auth-2.0.0" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz";
+        sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
+      };
+    };
     "boxen-0.6.0" = {
       name = "boxen";
       packageName = "boxen";
@@ -14364,6 +14337,15 @@ let
         sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
+    "tmp-0.0.31" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
+      };
+    };
     "useragent-2.2.1" = {
       name = "useragent";
       packageName = "useragent";
@@ -14373,13 +14355,13 @@ let
         sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
-    "utils-merge-1.0.1" = {
-      name = "utils-merge";
-      packageName = "utils-merge";
-      version = "1.0.1";
+    "finalhandler-1.0.6" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
-        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz";
+        sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f";
       };
     };
     "custom-event-1.0.1" = {
@@ -15183,6 +15165,15 @@ let
         sha1 = "765e7607c8055452bba6f0b052595350986036de";
       };
     };
+    "mime-1.3.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+      };
+    };
     "statuses-1.2.1" = {
       name = "statuses";
       packageName = "statuses";
@@ -15273,22 +15264,22 @@ let
         sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf";
       };
     };
-    "conventional-changelog-cli-1.3.3" = {
+    "conventional-changelog-cli-1.3.4" = {
       name = "conventional-changelog-cli";
       packageName = "conventional-changelog-cli";
-      version = "1.3.3";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.3.tgz";
-        sha512 = "1ihqjs3rh8v1g78l7k5bhp8c9qizmc5xzy9m8i2vvff1aa0jaxlzrpcvscvddxfx7mw1cgdgdqf9wqc12grfixi2bbb8wwx11f07fyr";
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz";
+        sha512 = "19sf25mfb7bg5c2dxm409isgy0l82khqviy1grzd48spdgbp2mfm01g4qm4qfwak05142k26mvhd0ds7iw2yynxwvmf4zsx9n5pbh3g";
       };
     };
-    "conventional-recommended-bump-1.0.1" = {
+    "conventional-recommended-bump-1.0.2" = {
       name = "conventional-recommended-bump";
       packageName = "conventional-recommended-bump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz";
-        sha512 = "0cn224cp4qa787r0gkxg66f8m3s6l4nimfi2hm9mi5b0fh1365nqcipq3p5g1l82lkz6xdc9ihv46pvrx7gr8l0lh563dvh8bqw8nnq";
+        url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.2.tgz";
+        sha512 = "1fnli57xfi29zij20i1ps8q1rdrh1awq5ca128gc87y604h8434y8sykhw8mx2lq5ncabmal7p8cld9gjph3x30lr5gky8wgfyh8blh";
       };
     };
     "dedent-0.7.0" = {
@@ -15399,13 +15390,13 @@ let
         sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9";
       };
     };
-    "write-json-file-2.2.0" = {
+    "write-json-file-2.3.0" = {
       name = "write-json-file";
       packageName = "write-json-file";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz";
-        sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876";
+        url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz";
+        sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f";
       };
     };
     "write-pkg-3.1.0" = {
@@ -15435,13 +15426,13 @@ let
         sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
       };
     };
-    "conventional-changelog-1.1.5" = {
+    "conventional-changelog-1.1.6" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.5.tgz";
-        sha512 = "3iwdmfgds5827b1sf3lv05i5hxkwr0m3327vdn8wlr2l13j9v5p8nc8ycjif6cdyykz4ziijz63j031drql411a8ip5s4v0g24k8hqd";
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz";
+        sha512 = "2ffx29rhcisbh01fd2vqwpkgqc25im5g0zrna5lh0dawsc3rh6ckz8p629wvw24xk26z7h6kh08i73zwffn056d6bgmchaqn8013901";
       };
     };
     "tempfile-1.1.1" = {
@@ -15453,13 +15444,13 @@ let
         sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
       };
     };
-    "conventional-changelog-angular-1.5.0" = {
+    "conventional-changelog-angular-1.5.1" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz";
-        sha512 = "1adk6b8bghfbfhb0ra4rma0ym0ws6k74k1cafvkcf14izfl34g2b4cns9nyb1w5jxa7nkcqzjcc1q42ldd4l7dqd65mjx3hzr4jmp8s";
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz";
+        sha512 = "14c5dfbhxpdrladq6cqml7q0ya3swqv2abyd0gjyhrjlbfqigg002p5pw2807sf5g8v5nl28p5qpzha1rvb35l3v28wr9w758zyfy02";
       };
     };
     "conventional-changelog-atom-0.1.1" = {
@@ -15480,22 +15471,22 @@ let
         sha512 = "3b5q7575vplhqxypaq7jzwkmn3pys0kln0gk9grr6il64c2swappb2vj4s5ly5w5whww5vnvg7qi7r9cbha8dwr8w7d0ab8qbvxhild";
       };
     };
-    "conventional-changelog-core-1.9.1" = {
+    "conventional-changelog-core-1.9.2" = {
       name = "conventional-changelog-core";
       packageName = "conventional-changelog-core";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz";
-        sha512 = "2nmgnplgql55fplnnba0s53mf8893qpp2a7r7ml740lx4f5gh3hknwgca32n3ag7m9h0s7ipaj921y56kdmx46v3axc6dmywd4ip38n";
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz";
+        sha512 = "0pya0kpddr0dw5i6rv0dx1p3kwbxiwn3rlf80phv5blrsxw4s7mzq02m9d4iya8gbk27938y9pqyzika2nis6sg17jnlafsllcfixig";
       };
     };
-    "conventional-changelog-ember-0.2.7" = {
+    "conventional-changelog-ember-0.2.8" = {
       name = "conventional-changelog-ember";
       packageName = "conventional-changelog-ember";
-      version = "0.2.7";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz";
-        sha512 = "092v9z574yp59rna4m9kjav5fif1avlvgrnqh5wvyb4a45gkax8d2z7hvcqvpg4jf48xg3jh7qb0a7bvsz348fzxw6wya2wwpv6ygay";
+        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz";
+        sha512 = "0k0s4ry497xk0xgmviy70l51b7sdrq74qw55mffc2jhivfnb92b638whriapgkj2j75y5m8h726nck2hys6dl2svbv9kxyjiz922sxj";
       };
     };
     "conventional-changelog-eslint-0.2.0" = {
@@ -15615,13 +15606,13 @@ let
         sha1 = "5282659dae2107145a11126112ad3216ec5fa65f";
       };
     };
-    "git-semver-tags-1.2.1" = {
+    "git-semver-tags-1.2.2" = {
       name = "git-semver-tags";
       packageName = "git-semver-tags";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz";
-        sha512 = "16mn1j3vray2l88lrl57pkaxz3bvv4ahnx3qr6r3hkdjarzqn1d8w99n44mn39y4kdmcva1z6annx92h06r870yq05382f76jvv2p3w";
+        url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz";
+        sha512 = "2fmj7x594d4xc7jkpbya2bhn0ysjdpslbajip0jz2is360vp29wlf3ycs193g2gxl7cw5ykb62gm93z1ywbfl49x4k0y1fakji0s4ky";
       };
     };
     "conventional-commits-filter-1.0.0" = {
@@ -15678,13 +15669,13 @@ let
         sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3";
       };
     };
-    "text-extensions-1.6.0" = {
+    "text-extensions-1.7.0" = {
       name = "text-extensions";
       packageName = "text-extensions";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.6.0.tgz";
-        sha512 = "2n3ivf9yag189fhh8wsncxhdsnq28zg6lnp91cwndbn4iygj2vxs39afdcvcyrfmhsjpqwy6qnjdhp1ylq8ka6q10cfcvmbbph38qsk";
+        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz";
+        sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980";
       };
     };
     "parse-github-repo-url-1.4.1" = {
@@ -16056,13 +16047,13 @@ let
         sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581";
       };
     };
-    "socket.io-2.0.3" = {
+    "socket.io-2.0.4" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz";
-        sha1 = "4359f06a24933ae6bd087798af78c680eae345e3";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz";
+        sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014";
       };
     };
     "linkify-it-2.0.3" = {
@@ -16128,13 +16119,13 @@ let
         sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
       };
     };
-    "engine.io-3.1.1" = {
+    "engine.io-3.1.3" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.1.tgz";
-        sha1 = "08051ffb951907a3267e72e0bcb3d0f377e4660b";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.3.tgz";
+        sha1 = "7aecf71bf8a310f9fa21461999c4fcc035f8a877";
       };
     };
     "socket.io-adapter-1.1.1" = {
@@ -16146,13 +16137,13 @@ let
         sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
       };
     };
-    "socket.io-client-2.0.3" = {
+    "socket.io-client-2.0.4" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz";
-        sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz";
+        sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e";
       };
     };
     "socket.io-parser-3.1.2" = {
@@ -16200,13 +16191,22 @@ let
         sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
       };
     };
-    "engine.io-client-3.1.1" = {
+    "engine.io-client-3.1.3" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz";
-        sha1 = "415a9852badb14fa008fa3ef1e31608db6761325";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.3.tgz";
+        sha1 = "d705e48985dfe8b54a98c9f77052b8b08258be05";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.4" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz";
+        sha1 = "04f560915724b389088715cc0ed7813e9677bf57";
       };
     };
     "connect-3.5.1" = {
@@ -16236,22 +16236,13 @@ let
         sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31";
       };
     };
-    "send-0.15.6" = {
-      name = "send";
-      packageName = "send";
-      version = "0.15.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz";
-        sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34";
-      };
-    };
-    "serve-index-1.9.0" = {
+    "serve-index-1.9.1" = {
       name = "serve-index";
       packageName = "serve-index";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz";
-        sha1 = "d2b280fc560d616ee81b48bf0fa82abed2485ce7";
+        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz";
+        sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
       };
     };
     "finalhandler-0.5.1" = {
@@ -16299,15 +16290,6 @@ let
         sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b";
       };
     };
-    "fresh-0.5.2" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
-        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
-      };
-    };
     "batch-0.6.1" = {
       name = "batch";
       packageName = "batch";
@@ -16443,31 +16425,22 @@ let
         sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
       };
     };
-    "commander-2.9.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
-      };
-    };
-    "diff-3.2.0" = {
+    "diff-3.3.1" = {
       name = "diff";
       packageName = "diff";
-      version = "3.2.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+        url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz";
+        sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh";
       };
     };
-    "growl-1.9.2" = {
+    "growl-1.10.3" = {
       name = "growl";
       packageName = "growl";
-      version = "1.9.2";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
-        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+        url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz";
+        sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
       };
     };
     "he-1.1.1" = {
@@ -16479,31 +16452,13 @@ let
         sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
       };
     };
-    "lodash.create-3.1.1" = {
-      name = "lodash.create";
-      packageName = "lodash.create";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
-        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
-      };
-    };
-    "supports-color-3.1.2" = {
+    "supports-color-4.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "3.1.2";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
-        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
-      };
-    };
-    "lodash._basecreate-3.0.3" = {
-      name = "lodash._basecreate";
-      packageName = "lodash._basecreate";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
-        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
+        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
     "json-refs-2.1.7" = {
@@ -16614,13 +16569,13 @@ let
         sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
       };
     };
-    "minizlib-1.0.3" = {
+    "minizlib-1.0.4" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
-        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz";
+        sha512 = "1lxpa3mkdc94i0d7b2ivilcky0gnmnxv5csmigzacb5gl2cz7rz4ciikq1r5an1simk86f61whwzyi5d8gic85w55q19d09sbv19pmh";
       };
     };
     "yallist-3.0.2" = {
@@ -16677,13 +16632,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "serve-favicon-2.4.4" = {
+    "serve-favicon-2.4.5" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.4.4";
+      version = "2.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.4.tgz";
-        sha1 = "412ddd74965151c9f74c0828f35d50c5250210de";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz";
+        sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk";
       };
     };
     "strong-data-uri-1.0.4" = {
@@ -16794,15 +16749,6 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "fresh-0.5.1" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.1.tgz";
-        sha1 = "c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c";
-      };
-    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -16875,13 +16821,13 @@ let
         sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
       };
     };
-    "update-notifier-2.2.0" = {
+    "update-notifier-2.3.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
-        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz";
+        sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
       };
     };
     "nopt-1.0.10" = {
@@ -16893,13 +16839,13 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "boxen-1.2.1" = {
+    "boxen-1.2.2" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
-        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
+        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
       };
     };
     "configstore-3.1.1" = {
@@ -16920,6 +16866,15 @@ let
         sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
       };
     };
+    "is-installed-globally-0.1.0" = {
+      name = "is-installed-globally";
+      packageName = "is-installed-globally";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
+        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+      };
+    };
     "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -16974,6 +16929,15 @@ let
         sha1 = "a230f64f568310e1498009940790ec99545bca7e";
       };
     };
+    "global-dirs-0.1.0" = {
+      name = "global-dirs";
+      packageName = "global-dirs";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.0.tgz";
+        sha1 = "10d34039e0df04272e262cf24224f7209434df4f";
+      };
+    };
     "package-json-4.0.1" = {
       name = "package-json";
       packageName = "package-json";
@@ -17073,6 +17037,15 @@ let
         sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a";
       };
     };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
     "fs.notify-0.0.4" = {
       name = "fs.notify";
       packageName = "fs.notify";
@@ -17460,6 +17433,24 @@ let
         sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
+    "fresh-0.5.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz";
+        sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e";
+      };
+    };
+    "proxy-addr-1.1.5" = {
+      name = "proxy-addr";
+      packageName = "proxy-addr";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz";
+        sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
+      };
+    };
     "send-0.15.3" = {
       name = "send";
       packageName = "send";
@@ -17478,6 +17469,24 @@ let
         sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
       };
     };
+    "ipaddr.js-1.4.0" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
+        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
+      };
+    };
+    "crc-3.4.4" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
+      };
+    };
     "debug-2.6.3" = {
       name = "debug";
       packageName = "debug";
@@ -17685,6 +17694,15 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
+    "commander-2.9.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -18522,15 +18540,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "aproba-1.1.2" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
-      };
-    };
     "cacache-9.2.9" = {
       name = "cacache";
       packageName = "cacache";
@@ -18549,6 +18558,24 @@ let
         sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
       };
     };
+    "cli-table2-0.2.0" = {
+      name = "cli-table2";
+      packageName = "cli-table2";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz";
+        sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97";
+      };
+    };
+    "is-cidr-1.0.0" = {
+      name = "is-cidr";
+      packageName = "is-cidr";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz";
+        sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc";
+      };
+    };
     "lazy-property-1.0.0" = {
       name = "lazy-property";
       packageName = "lazy-property";
@@ -18657,13 +18684,31 @@ let
         sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa";
       };
     };
-    "npm-packlist-1.1.9" = {
+    "npm-packlist-1.1.10" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz";
-        sha512 = "1d1l5hasnw67hczgcwbc8534n1hgvx87hin1yr14yz70b4yzp06gfrj97lhh0qfmk5p1lqfrzajhs5wywx98hj75g00mqmir54050gm";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
+        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
+      };
+    };
+    "npm-profile-2.0.5" = {
+      name = "npm-profile";
+      packageName = "npm-profile";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz";
+        sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl";
+      };
+    };
+    "npm-registry-client-8.5.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz";
+        sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -18684,13 +18729,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-6.0.2" = {
+    "pacote-6.0.4" = {
       name = "pacote";
       packageName = "pacote";
-      version = "6.0.2";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.2.tgz";
-        sha512 = "2721b5lapgglck02ikkhxgkmg5gs1l8ld712ixb94d86zrspvzn3z81678kcpqvpvs7a0ykgganm9nb1p2668zss7cdib5z6jrg7j9y";
+        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz";
+        sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -18702,6 +18747,33 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
+    "qrcode-terminal-0.11.0" = {
+      name = "qrcode-terminal";
+      packageName = "qrcode-terminal";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz";
+        sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
+      };
+    };
+    "query-string-5.0.0" = {
+      name = "query-string";
+      packageName = "query-string";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz";
+        sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947";
+      };
+    };
+    "qw-1.0.1" = {
+      name = "qw";
+      packageName = "qw";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz";
+        sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4";
+      };
+    };
     "read-package-tree-5.1.6" = {
       name = "read-package-tree";
       packageName = "read-package-tree";
@@ -18720,13 +18792,13 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
-    "tar-4.0.1" = {
+    "tar-4.0.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.0.1.tgz";
-        sha512 = "3j6x1q724j4y32xqgmnafwr0063xlr4bw5ra92zsar6iyqikcfy02lpc98h4ss75vxywza639m3b9cps9z4xdlr2cpy6g5kyvxm86jw";
+        url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz";
+        sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2";
       };
     };
     "unique-filename-1.1.0" = {
@@ -18738,6 +18810,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "update-notifier-2.2.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
+        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+      };
+    };
     "worker-farm-1.5.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -18783,6 +18864,15 @@ let
         sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
       };
     };
+    "cidr-regex-1.0.6" = {
+      name = "cidr-regex";
+      packageName = "cidr-regex";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz";
+        sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1";
+      };
+    };
     "dotenv-4.0.0" = {
       name = "dotenv";
       packageName = "dotenv";
@@ -18828,13 +18918,13 @@ let
         sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
       };
     };
-    "stream-each-1.2.0" = {
+    "stream-each-1.2.2" = {
       name = "stream-each";
       packageName = "stream-each";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
-        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
+        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
       };
     };
     "cyclist-0.2.2" = {
@@ -18864,13 +18954,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "ignore-walk-3.0.0" = {
+    "ignore-walk-3.0.1" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz";
-        sha512 = "0ly2gpx2q4zi46dbnwhp2g329vfhqrbfh1piy5hvgfzpasbq61ymaxg64qsxiqx6qqv396m0ad7abs3q3sv702w42xfli8qpm1yp8dl";
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -18891,33 +18981,6 @@ let
         sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
       };
     };
-    "npm-pick-manifest-1.0.4" = {
-      name = "npm-pick-manifest";
-      packageName = "npm-pick-manifest";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
-      };
-    };
-    "promise-retry-1.1.1" = {
-      name = "promise-retry";
-      packageName = "promise-retry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
-        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
-      };
-    };
-    "protoduck-4.0.0" = {
-      name = "protoduck";
-      packageName = "protoduck";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
-        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
-      };
-    };
     "agentkeepalive-3.3.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
@@ -18927,13 +18990,13 @@ let
         sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
-    "http-cache-semantics-3.7.3" = {
+    "http-cache-semantics-3.8.0" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "3.7.3";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz";
-        sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.0.tgz";
+        sha512 = "258k0vff4wrszl7vnpv4c67zc5qk0mnl8banhp8znianmahxv1y55lpz0877jicsw1k0y8g0glz4my71dd9y3ywzpingfvb2xy0ar0w";
       };
     };
     "http-proxy-agent-2.0.0" = {
@@ -18945,15 +19008,6 @@ let
         sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
       };
     };
-    "https-proxy-agent-2.1.0" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
-      };
-    };
     "node-fetch-npm-2.0.2" = {
       name = "node-fetch-npm";
       packageName = "node-fetch-npm";
@@ -18963,6 +19017,15 @@ let
         sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
+    "promise-retry-1.1.1" = {
+      name = "promise-retry";
+      packageName = "promise-retry";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
+        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
+      };
+    };
     "socks-proxy-agent-3.0.1" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -18981,31 +19044,13 @@ let
         sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
       };
     };
-    "agent-base-4.1.1" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.1.1";
+    "err-code-1.1.2" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
-      };
-    };
-    "es6-promise-4.1.1" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
+        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
       };
     };
     "socks-1.1.10" = {
@@ -19026,13 +19071,22 @@ let
         sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
       };
     };
-    "err-code-1.1.2" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.2";
+    "npm-pick-manifest-1.0.4" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
-        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
+      };
+    };
+    "protoduck-4.0.0" = {
+      name = "protoduck";
+      packageName = "protoduck";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
+        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
     "genfun-4.0.1" = {
@@ -19044,6 +19098,24 @@ let
         sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
       };
     };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
+    "strict-uri-encode-1.1.0" = {
+      name = "strict-uri-encode";
+      packageName = "strict-uri-encode";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -19269,15 +19341,6 @@ let
         sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
       };
     };
-    "require-dir-0.3.2" = {
-      name = "require-dir";
-      packageName = "require-dir";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.2.tgz";
-        sha1 = "c1d5c75e9fbffde9f2e6b33e383db4f594b5a6a9";
-      };
-    };
     "semver-utils-1.1.1" = {
       name = "semver-utils";
       packageName = "semver-utils";
@@ -19287,13 +19350,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.41.1" = {
+    "snyk-1.45.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.41.1";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.41.1.tgz";
-        sha1 = "34ac2239337f4fbfa4192b10f2d4d67bf6d117cf";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.45.0.tgz";
+        sha1 = "890eae8b1c14ff8ff1be25388702cb585df86834";
       };
     };
     "spawn-please-0.3.0" = {
@@ -19413,22 +19476,22 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.30" = {
+    "es5-ext-0.10.35" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.30";
+      version = "0.10.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz";
-        sha1 = "7141a16836697dbabfaaaeee41495ce29f52c939";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz";
+        sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f";
       };
     };
-    "es6-iterator-2.0.1" = {
+    "es6-iterator-2.0.3" = {
       name = "es6-iterator";
       packageName = "es6-iterator";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
-        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
       };
     };
     "form-data-2.0.0" = {
@@ -19476,22 +19539,22 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-go-plugin-1.2.1" = {
+    "snyk-go-plugin-1.3.7" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.2.1";
+      version = "1.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.2.1.tgz";
-        sha512 = "3fvzskjkhljbpcha1z2bk9ca96bcyqc1hb8i2fz7ck71bmfvq9q1wxq1rmp981zmmxvag6igdxsxcq8nrc5igq5s452qr8x9b2g6s9a";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.7.tgz";
+        sha512 = "0i5dcqyyfmb0caz9fa3qaqx7k1f79qyd9y6jn031c75647y8hmk265w6ynkpz8gkv7cn4w6cznrm5q436vg4wgs1ahqd5xrwkhsbxp4";
       };
     };
-    "snyk-gradle-plugin-1.1.2" = {
+    "snyk-gradle-plugin-1.2.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.2.tgz";
-        sha512 = "17xbvmgijgmbpr01mq7z5hhbi9yjwj7mffmfngi8jbva19yggcns4srn18wh8bya0bb0hsjzj5g1lkzc6ndn1vyx95kfkqv6yrs9diq";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz";
+        sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn";
       };
     };
     "snyk-module-1.8.1" = {
@@ -19503,13 +19566,13 @@ let
         sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
-    "snyk-mvn-plugin-1.0.3" = {
+    "snyk-mvn-plugin-1.1.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.3.tgz";
-        sha512 = "3p1ji20lrwfgq8gv8br38nk8l5sklhpvmgdcp9il01f22pzclaqnvrh8pcihkq5x74rifhcra6kqjz057i0mmrk8p3w3yq8gikqgz7l";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.0.tgz";
+        sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r";
       };
     };
     "snyk-policy-1.7.1" = {
@@ -19521,13 +19584,13 @@ let
         sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
-    "snyk-python-plugin-1.2.4" = {
+    "snyk-python-plugin-1.4.0" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.2.4";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.4.tgz";
-        sha512 = "3n3rsr3cfa5jib3vlhwh6q60a6v7plc6gqwvylkc0q2yn99cb9syxkddzg0122apg98f10g2sy3y8mmsxyi7wpzklmhqmflv7q7dsiq";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz";
+        sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -19557,13 +19620,13 @@ let
         sha1 = "13743a058437dff890baaf437c333c966a743cb6";
       };
     };
-    "snyk-sbt-plugin-1.1.1" = {
+    "snyk-sbt-plugin-1.2.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.1.tgz";
-        sha512 = "38hp4kdx53qwknznqzi3j2y8i7hcwbmpbn6rk2lyszg4aly2dqvphk2hs8msij6s20lr884l8wkvc6rw9qpid8cqm75inl7wa2c5an0";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.0.tgz";
+        sha512 = "002ibp199wy3pk8dldcfr83njcrgx7hk1c802hwa9skky7jw5c4infnaj9aignghi2l1w44p3cjk3xwbcrryldj3hh63vbyzpryg3qz";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -19782,58 +19845,22 @@ let
         sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
-    "async-2.4.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz";
-        sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
-      };
-    };
-    "lokijs-1.4.3" = {
+    "lokijs-1.5.0" = {
       name = "lokijs";
       packageName = "lokijs";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.4.3.tgz";
-        sha1 = "f2a47ba8d6991c92d6da6a5b35be79b674453abb";
+        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.0.tgz";
+        sha1 = "99e403d6a89e47e11ed0c5d499fb55a0603d5efc";
       };
     };
-    "vscode-jsonrpc-3.2.0" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.2.0.tgz";
-        sha1 = "c92b946ac385c8b41439b842b6bd07d517b64a7d";
-      };
-    };
-    "vscode-languageclient-3.2.2" = {
+    "vscode-languageclient-3.4.5" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
-      version = "3.2.2";
+      version = "3.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.2.2.tgz";
-        sha1 = "7843839614aa099f172b4e5f8967d42b58d77f0d";
-      };
-    };
-    "vscode-languageserver-3.2.2" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.2.2.tgz";
-        sha1 = "9a7b66e1252838ea51a0061145089a2b88a9516a";
-      };
-    };
-    "vscode-languageserver-types-3.2.0" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.2.0.tgz";
-        sha1 = "8874ed92dbfa66df5fb0e2bf73f614cf9483be8f";
+        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.5.tgz";
+        sha1 = "6230072ab0772085d09b48f99b79e7c421ddfbb7";
       };
     };
     "babybird-0.0.1" = {
@@ -20443,13 +20470,13 @@ let
         sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917";
       };
     };
-    "connect-multiparty-2.0.0" = {
+    "connect-multiparty-2.1.0" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz";
-        sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab";
+        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz";
+        sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c";
       };
     };
     "socket.io-1.7.4" = {
@@ -20515,6 +20542,24 @@ let
         sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
       };
     };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
     "request-2.67.0" = {
       name = "request";
       packageName = "request";
@@ -20524,6 +20569,15 @@ let
         sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
     "concat-stream-1.5.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -20560,6 +20614,24 @@ let
         sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
       };
     };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "browserify-13.3.0" = {
+      name = "browserify";
+      packageName = "browserify";
+      version = "13.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+        sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      };
+    };
     "browserify-incremental-3.1.1" = {
       name = "browserify-incremental";
       packageName = "browserify-incremental";
@@ -20605,6 +20677,15 @@ let
         sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac";
       };
     };
+    "https-browserify-0.0.1" = {
+      name = "https-browserify";
+      packageName = "https-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
+        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+      };
+    };
     "JSONStream-0.10.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
@@ -21002,22 +21083,31 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "args-3.0.4" = {
+    "args-3.0.7" = {
       name = "args";
       packageName = "args";
-      version = "3.0.4";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/args/-/args-3.0.4.tgz";
-        sha512 = "2441a84bwxxm0zcn133ngf0aj1f8jidgfsvm40wa8ap98lkzyzv8fppfsl1dhxpni70mpgl8yik9anc2vrgh1n1immkhw3z6727r9ll";
+        url = "https://registry.npmjs.org/args/-/args-3.0.7.tgz";
+        sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r";
       };
     };
-    "basic-auth-2.0.0" = {
-      name = "basic-auth";
-      packageName = "basic-auth";
-      version = "2.0.0";
+    "boxen-1.2.1" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz";
-        sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
+        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
+      };
+    };
+    "chalk-2.1.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
       };
     };
     "detect-port-1.2.1" = {
@@ -21038,6 +21128,15 @@ let
         sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f";
       };
     };
+    "handlebars-4.0.10" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "4.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz";
+        sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f";
+      };
+    };
     "micro-9.0.0" = {
       name = "micro";
       packageName = "micro";
@@ -21065,6 +21164,15 @@ let
         sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp";
       };
     };
+    "openssl-self-signed-certificate-1.1.6" = {
+      name = "openssl-self-signed-certificate";
+      packageName = "openssl-self-signed-certificate";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz";
+        sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4";
+      };
+    };
     "path-type-3.0.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -21074,33 +21182,6 @@ let
         sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
       };
     };
-    "chalk-2.0.1" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
-        sha512 = "398mvhli8dvcn53xaqllyjzp19z8gh3j75fvp4gv5njnnkhsikx3byfb6lx432pl0073hn75prc8gb0ysbf65bnzlcbq5iy89f8b7rj";
-      };
-    };
-    "pkginfo-0.4.0" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
-        sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
-      };
-    };
-    "address-1.0.3" = {
-      name = "address";
-      packageName = "address";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz";
-        sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng";
-      };
-    };
     "mri-1.1.0" = {
       name = "mri";
       packageName = "mri";
@@ -21110,22 +21191,22 @@ let
         sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a";
       };
     };
-    "pify-3.0.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "3.0.0";
+    "address-1.0.3" = {
+      name = "address";
+      packageName = "address";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
-        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+        url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz";
+        sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng";
       };
     };
-    "express-5.0.0-alpha.5" = {
+    "express-5.0.0-alpha.6" = {
       name = "express";
       packageName = "express";
-      version = "5.0.0-alpha.5";
+      version = "5.0.0-alpha.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz";
-        sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz";
+        sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e";
       };
     };
     "express-json5-0.1.0" = {
@@ -21209,40 +21290,40 @@ let
         sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "debug-2.6.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.1";
+    "qs-6.5.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
+        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
       };
     };
-    "router-1.3.1" = {
+    "router-1.3.2" = {
       name = "router";
       packageName = "router";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.3.1.tgz";
-        sha1 = "e59ef64fafc22194a196986834d887058d76af47";
+        url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz";
+        sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c";
       };
     };
-    "send-0.15.1" = {
+    "send-0.15.6" = {
       name = "send";
       packageName = "send";
-      version = "0.15.1";
+      version = "0.15.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
-        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
+        url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz";
+        sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34";
       };
     };
-    "serve-static-1.12.1" = {
+    "serve-static-1.12.6" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.1";
+      version = "1.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
-        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz";
+        sha1 = "b973773f63449934da54e5beba5e31d9f4211577";
       };
     };
     "raw-body-1.3.4" = {
@@ -21515,13 +21596,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.2.3" = {
+    "csv-parse-1.3.3" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.2.3";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.3.tgz";
-        sha512 = "2gjf255jzzbvfv1ib97ahsjqcw53i1w42725cbynvkvdqvfkvfimrjbf3c1bdzbrxp1mad9znzb3d63a29b2adlrz7jkjsx43i5z3nq";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz";
+        sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490";
       };
     };
     "stream-transform-0.1.2" = {
@@ -21803,6 +21884,15 @@ let
         sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3";
       };
     };
+    "log-update-1.0.2" = {
+      name = "log-update";
+      packageName = "log-update";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
+        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
+      };
+    };
     "promise-finally-3.0.0" = {
       name = "promise-finally";
       packageName = "promise-finally";
@@ -21911,13 +22001,13 @@ let
         sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
       };
     };
-    "typescript-2.5.2" = {
+    "typescript-2.5.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.5.2";
+      version = "2.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz";
-        sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz";
+        sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6";
       };
     };
     "zip-object-0.1.0" = {
@@ -21974,13 +22064,22 @@ let
         sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
       };
     };
-    "blueimp-md5-2.8.0" = {
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+      };
+    };
+    "blueimp-md5-2.10.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.8.0";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.8.0.tgz";
-        sha512 = "3k2jkipyh7gdwg827wlnjaq8zj2wajj8c9c7p2il6qzbk16565fwl2dr6jjp0b2fv7lichvxzpl933ixazf2j3i0pq91fh2g7imhcv7";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz";
+        sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj";
       };
     };
     "color-2.0.0" = {
@@ -22001,22 +22100,31 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-2.3.0" = {
+    "diff2html-2.3.2" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.3.0";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz";
-        sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.2.tgz";
+        sha1 = "1c5864266d437148bc66fdd66d4ad750102d7fed";
       };
     };
-    "express-session-1.15.5" = {
+    "express-4.15.5" = {
+      name = "express";
+      packageName = "express";
+      version = "4.15.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.15.5.tgz";
+        sha1 = "670235ca9598890a5ae8170b83db722b842ed927";
+      };
+    };
+    "express-session-1.15.6" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.15.5";
+      version = "1.15.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz";
-        sha512 = "0xr0b4wp67nzril9h59g1ag2siwazl9kkfy45cq317w0x9q6apr82i9hvqrmjpp9zfvzfidz0vvd1pczsa7namwsdwk1anp9zl74584";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz";
+        sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -22082,13 +22190,13 @@ let
         sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
       };
     };
-    "npm-4.6.1" = {
+    "npm-5.4.2" = {
       name = "npm";
       packageName = "npm";
-      version = "4.6.1";
+      version = "5.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
-        sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
+        url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz";
+        sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp";
       };
     };
     "octicons-3.5.0" = {
@@ -22118,15 +22226,6 @@ let
         sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4";
       };
     };
-    "serve-static-1.12.6" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.12.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz";
-        sha1 = "b973773f63449934da54e5beba5e31d9f4211577";
-      };
-    };
     "signals-1.0.0" = {
       name = "signals";
       packageName = "signals";
@@ -22163,6 +22262,15 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
+    "yargs-9.0.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "9.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz";
+        sha1 = "52acc23feecac34042078ee78c0c007f5085db4c";
+      };
+    };
     "color-string-1.5.2" = {
       name = "color-string";
       packageName = "color-string";
@@ -22325,49 +22433,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "hosted-git-info-2.4.2" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.4.2";
+    "aproba-1.1.2" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
-        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
-      };
-    };
-    "npm-registry-client-8.1.1" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
-        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
-      };
-    };
-    "readable-stream-2.2.11" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha512 = "3sn0n3ncghvdrhy082cysiswswps9d5824ppjkl7gl1z1r6f11ij6z9nvs3l8gbp7vys1kgamrnikas3azjh7dwaqi1j4haffpkxvw7";
-      };
-    };
-    "update-notifier-2.1.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
-        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
-      };
-    };
-    "lazy-req-2.0.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
-        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
+        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
       };
     };
     "lsmod-1.0.0" = {
@@ -22460,15 +22532,6 @@ let
         sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
       };
     };
-    "ajv-keywords-2.1.0" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz";
-        sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0";
-      };
-    };
     "enhanced-resolve-3.4.1" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -22631,6 +22694,1095 @@ let
         sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93";
       };
     };
+    "addons-linter-0.27.0" = {
+      name = "addons-linter";
+      packageName = "addons-linter";
+      version = "0.27.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.27.0.tgz";
+        sha512 = "1pj51znvw4qfcji454ykz9iwh33jkws8dq78aavxzjjyibsssamdlsw01j81v4xy93w33d4ckq72r3nn8v9q34vh19izb7s05hqhw4y";
+      };
+    };
+    "babel-polyfill-6.20.0" = {
+      name = "babel-polyfill";
+      packageName = "babel-polyfill";
+      version = "6.20.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.20.0.tgz";
+        sha1 = "de4a371006139e20990aac0be367d398331204e7";
+      };
+    };
+    "babel-runtime-6.25.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz";
+        sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c";
+      };
+    };
+    "bunyan-1.8.10" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz";
+        sha1 = "201fedd26c7080b632f416072f53a90b9a52981c";
+      };
+    };
+    "debounce-1.0.2" = {
+      name = "debounce";
+      packageName = "debounce";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debounce/-/debounce-1.0.2.tgz";
+        sha1 = "503cc674d8d7f737099664fb75ddbd36b9626dc6";
+      };
+    };
+    "es6-error-4.0.2" = {
+      name = "es6-error";
+      packageName = "es6-error";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz";
+        sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98";
+      };
+    };
+    "event-to-promise-0.8.0" = {
+      name = "event-to-promise";
+      packageName = "event-to-promise";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz";
+        sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626";
+      };
+    };
+    "firefox-profile-0.5.0" = {
+      name = "firefox-profile";
+      packageName = "firefox-profile";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-0.5.0.tgz";
+        sha1 = "036de91fe3ff218d9ed8252d924f49bca0b672bd";
+      };
+    };
+    "fx-runner-1.0.8" = {
+      name = "fx-runner";
+      packageName = "fx-runner";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz";
+        sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec";
+      };
+    };
+    "git-rev-sync-1.9.1" = {
+      name = "git-rev-sync";
+      packageName = "git-rev-sync";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz";
+        sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce";
+      };
+    };
+    "mz-2.6.0" = {
+      name = "mz";
+      packageName = "mz";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz";
+        sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce";
+      };
+    };
+    "node-firefox-connect-1.2.0" = {
+      name = "node-firefox-connect";
+      packageName = "node-firefox-connect";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz";
+        sha1 = "42403848313240c98514ef14b3302816fe3b84e1";
+      };
+    };
+    "node-notifier-5.1.2" = {
+      name = "node-notifier";
+      packageName = "node-notifier";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz";
+        sha1 = "2fa9e12605fa10009d44549d6fcd8a63dde0e4ff";
+      };
+    };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
+    "sign-addon-0.2.1" = {
+      name = "sign-addon";
+      packageName = "sign-addon";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.1.tgz";
+        sha1 = "0172bdd9fdee7bdc636f3833b6977a556c75388e";
+      };
+    };
+    "source-map-support-0.5.0" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz";
+        sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx";
+      };
+    };
+    "stream-to-promise-2.2.0" = {
+      name = "stream-to-promise";
+      packageName = "stream-to-promise";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz";
+        sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f";
+      };
+    };
+    "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";
+      };
+    };
+    "watchpack-1.3.0" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.0.tgz";
+        sha1 = "5164d4faabb88dcf277f17c8a3b16bfd3da8bee3";
+      };
+    };
+    "zip-dir-1.0.2" = {
+      name = "zip-dir";
+      packageName = "zip-dir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz";
+        sha1 = "253f907aead62a21acd8721d8b88032b2411c051";
+      };
+    };
+    "ajv-5.2.3" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz";
+        sha1 = "c06f598778c44c6b161abafe3466b81ad1814ed2";
+      };
+    };
+    "cheerio-1.0.0-rc.2" = {
+      name = "cheerio";
+      packageName = "cheerio";
+      version = "1.0.0-rc.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz";
+        sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db";
+      };
+    };
+    "common-tags-1.4.0" = {
+      name = "common-tags";
+      packageName = "common-tags";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz";
+        sha1 = "1187be4f3d4cf0c0427d43f74eef1f73501614c0";
+      };
+    };
+    "crx-parser-0.1.2" = {
+      name = "crx-parser";
+      packageName = "crx-parser";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz";
+        sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d";
+      };
+    };
+    "doctoc-1.3.0" = {
+      name = "doctoc";
+      packageName = "doctoc";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz";
+        sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30";
+      };
+    };
+    "dispensary-0.10.19" = {
+      name = "dispensary";
+      packageName = "dispensary";
+      version = "0.10.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.10.19.tgz";
+        sha1 = "457993df5f4a7e03f6fa00ec8ac4f8b21bebab69";
+      };
+    };
+    "eslint-4.8.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "4.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz";
+        sha1 = "229ef0e354e0e61d837c7a80fdfba825e199815e";
+      };
+    };
+    "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
+      name = "eslint-plugin-no-unsafe-innerhtml";
+      packageName = "eslint-plugin-no-unsafe-innerhtml";
+      version = "1.0.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz";
+        sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932";
+      };
+    };
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
+      };
+    };
+    "jed-1.1.1" = {
+      name = "jed";
+      packageName = "jed";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz";
+        sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
+      };
+    };
+    "pino-4.8.0" = {
+      name = "pino";
+      packageName = "pino";
+      version = "4.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pino/-/pino-4.8.0.tgz";
+        sha1 = "ffe37684233ebf33ffa58140d7fb5c1f7e170ecd";
+      };
+    };
+    "postcss-6.0.11" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "6.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz";
+        sha512 = "1raf6rg2rp67ql9bgihz0b0laxjakl84aqf428a7d370fcq5hzfnb4gj7gkyqx5zafw6h9y1b5c666k0acjxh34n1mhlifd777wij8f";
+      };
+    };
+    "relaxed-json-1.0.1" = {
+      name = "relaxed-json";
+      packageName = "relaxed-json";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/relaxed-json/-/relaxed-json-1.0.1.tgz";
+        sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4";
+      };
+    };
+    "strip-bom-stream-3.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
+        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
+      };
+    };
+    "whatwg-url-6.3.0" = {
+      name = "whatwg-url";
+      packageName = "whatwg-url";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz";
+        sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc";
+      };
+    };
+    "yauzl-2.8.0" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz";
+        sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2";
+      };
+    };
+    "parse5-3.0.2" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz";
+        sha1 = "05eff57f0ef4577fb144a79f8b9a967a6cc44510";
+      };
+    };
+    "@types/node-6.0.90" = {
+      name = "@types/node";
+      packageName = "@types/node";
+      version = "6.0.90";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz";
+        sha512 = "2q3rymdpikk7mc1rlmv8r1n0rlw856xmw64dx65mi90khgn1plppcsal3jvcbbhc527f06fh2wk9yargn2mlmgxxibhdvv2ax2hcymm";
+      };
+    };
+    "anchor-markdown-header-0.5.7" = {
+      name = "anchor-markdown-header";
+      packageName = "anchor-markdown-header";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz";
+        sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7";
+      };
+    };
+    "markdown-to-ast-3.4.0" = {
+      name = "markdown-to-ast";
+      packageName = "markdown-to-ast";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz";
+        sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7";
+      };
+    };
+    "update-section-0.3.3" = {
+      name = "update-section";
+      packageName = "update-section";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz";
+        sha1 = "458f17820d37820dc60e20b86d94391b00123158";
+      };
+    };
+    "emoji-regex-6.1.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "6.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz";
+        sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932";
+      };
+    };
+    "remark-5.1.0" = {
+      name = "remark";
+      packageName = "remark";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz";
+        sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c";
+      };
+    };
+    "structured-source-3.0.2" = {
+      name = "structured-source";
+      packageName = "structured-source";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz";
+        sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5";
+      };
+    };
+    "traverse-0.6.6" = {
+      name = "traverse";
+      packageName = "traverse";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      };
+    };
+    "remark-parse-1.1.0" = {
+      name = "remark-parse";
+      packageName = "remark-parse";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz";
+        sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21";
+      };
+    };
+    "remark-stringify-1.1.0" = {
+      name = "remark-stringify";
+      packageName = "remark-stringify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz";
+        sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092";
+      };
+    };
+    "unified-4.2.1" = {
+      name = "unified";
+      packageName = "unified";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz";
+        sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e";
+      };
+    };
+    "collapse-white-space-1.0.3" = {
+      name = "collapse-white-space";
+      packageName = "collapse-white-space";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz";
+        sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c";
+      };
+    };
+    "parse-entities-1.1.1" = {
+      name = "parse-entities";
+      packageName = "parse-entities";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz";
+        sha1 = "8112d88471319f27abae4d64964b122fe4e1b890";
+      };
+    };
+    "trim-0.0.1" = {
+      name = "trim";
+      packageName = "trim";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz";
+        sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
+      };
+    };
+    "trim-trailing-lines-1.1.0" = {
+      name = "trim-trailing-lines";
+      packageName = "trim-trailing-lines";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz";
+        sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684";
+      };
+    };
+    "unherit-1.1.0" = {
+      name = "unherit";
+      packageName = "unherit";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz";
+        sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d";
+      };
+    };
+    "unist-util-remove-position-1.1.1" = {
+      name = "unist-util-remove-position";
+      packageName = "unist-util-remove-position";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz";
+        sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb";
+      };
+    };
+    "vfile-location-2.0.2" = {
+      name = "vfile-location";
+      packageName = "vfile-location";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz";
+        sha1 = "d3675c59c877498e492b4756ff65e4af1a752255";
+      };
+    };
+    "character-entities-1.2.1" = {
+      name = "character-entities";
+      packageName = "character-entities";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz";
+        sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca";
+      };
+    };
+    "character-entities-legacy-1.1.1" = {
+      name = "character-entities-legacy";
+      packageName = "character-entities-legacy";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz";
+        sha1 = "f40779df1a101872bb510a3d295e1fccf147202f";
+      };
+    };
+    "character-reference-invalid-1.1.1" = {
+      name = "character-reference-invalid";
+      packageName = "character-reference-invalid";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz";
+        sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc";
+      };
+    };
+    "is-alphanumerical-1.0.1" = {
+      name = "is-alphanumerical";
+      packageName = "is-alphanumerical";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz";
+        sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b";
+      };
+    };
+    "is-decimal-1.0.1" = {
+      name = "is-decimal";
+      packageName = "is-decimal";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz";
+        sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82";
+      };
+    };
+    "is-hexadecimal-1.0.1" = {
+      name = "is-hexadecimal";
+      packageName = "is-hexadecimal";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz";
+        sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69";
+      };
+    };
+    "is-alphabetical-1.0.1" = {
+      name = "is-alphabetical";
+      packageName = "is-alphabetical";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz";
+        sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08";
+      };
+    };
+    "unist-util-visit-1.1.3" = {
+      name = "unist-util-visit";
+      packageName = "unist-util-visit";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz";
+        sha1 = "ec268e731b9d277a79a5b5aa0643990e405d600b";
+      };
+    };
+    "ccount-1.0.2" = {
+      name = "ccount";
+      packageName = "ccount";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz";
+        sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89";
+      };
+    };
+    "longest-streak-1.0.0" = {
+      name = "longest-streak";
+      packageName = "longest-streak";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz";
+        sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965";
+      };
+    };
+    "markdown-table-0.4.0" = {
+      name = "markdown-table";
+      packageName = "markdown-table";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz";
+        sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1";
+      };
+    };
+    "stringify-entities-1.3.1" = {
+      name = "stringify-entities";
+      packageName = "stringify-entities";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz";
+        sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c";
+      };
+    };
+    "character-entities-html4-1.1.1" = {
+      name = "character-entities-html4";
+      packageName = "character-entities-html4";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz";
+        sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50";
+      };
+    };
+    "bail-1.0.2" = {
+      name = "bail";
+      packageName = "bail";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz";
+        sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764";
+      };
+    };
+    "trough-1.0.1" = {
+      name = "trough";
+      packageName = "trough";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz";
+        sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86";
+      };
+    };
+    "vfile-1.4.0" = {
+      name = "vfile";
+      packageName = "vfile";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz";
+        sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
+      };
+    };
+    "boundary-1.0.1" = {
+      name = "boundary";
+      packageName = "boundary";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz";
+        sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812";
+      };
+    };
+    "array-from-2.1.1" = {
+      name = "array-from";
+      packageName = "array-from";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz";
+        sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195";
+      };
+    };
+    "natural-compare-lite-1.4.0" = {
+      name = "natural-compare-lite";
+      packageName = "natural-compare-lite";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz";
+        sha1 = "17b09581988979fddafe0201e931ba933c96cbb4";
+      };
+    };
+    "eslint-3.19.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "3.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
+        sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+      };
+    };
+    "inquirer-0.12.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
+        sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
+      };
+    };
+    "pluralize-1.2.1" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
+        sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
+      };
+    };
+    "table-3.8.3" = {
+      name = "table";
+      packageName = "table";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+      };
+    };
+    "ajv-keywords-1.5.1" = {
+      name = "ajv-keywords";
+      packageName = "ajv-keywords";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
+        sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c";
+      };
+    };
+    "slice-ansi-0.0.4" = {
+      name = "slice-ansi";
+      packageName = "slice-ansi";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz";
+        sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
+      };
+    };
+    "fast-json-parse-1.0.3" = {
+      name = "fast-json-parse";
+      packageName = "fast-json-parse";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz";
+        sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m";
+      };
+    };
+    "fast-safe-stringify-1.2.0" = {
+      name = "fast-safe-stringify";
+      packageName = "fast-safe-stringify";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.0.tgz";
+        sha1 = "ebd42666fd18fe4f2ba4f0d295065f3f85cade96";
+      };
+    };
+    "flatstr-1.0.5" = {
+      name = "flatstr";
+      packageName = "flatstr";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz";
+        sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3";
+      };
+    };
+    "quick-format-unescaped-1.1.1" = {
+      name = "quick-format-unescaped";
+      packageName = "quick-format-unescaped";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz";
+        sha1 = "e77555ef3e66e105d4039e13ef79201284fee916";
+      };
+    };
+    "strip-bom-buf-1.0.0" = {
+      name = "strip-bom-buf";
+      packageName = "strip-bom-buf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
+        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
+      };
+    };
+    "lodash.sortby-4.7.0" = {
+      name = "lodash.sortby";
+      packageName = "lodash.sortby";
+      version = "4.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz";
+        sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
+      };
+    };
+    "tr46-1.0.1" = {
+      name = "tr46";
+      packageName = "tr46";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz";
+        sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
+      };
+    };
+    "webidl-conversions-4.0.2" = {
+      name = "webidl-conversions";
+      packageName = "webidl-conversions";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
+        sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1";
+      };
+    };
+    "archiver-1.3.0" = {
+      name = "archiver";
+      packageName = "archiver";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz";
+        sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22";
+      };
+    };
+    "fs-extra-2.1.2" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz";
+        sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35";
+      };
+    };
+    "jetpack-id-1.0.0" = {
+      name = "jetpack-id";
+      packageName = "jetpack-id";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz";
+        sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6";
+      };
+    };
+    "walkdir-0.0.11" = {
+      name = "walkdir";
+      packageName = "walkdir";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz";
+        sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532";
+      };
+    };
+    "when-3.7.7" = {
+      name = "when";
+      packageName = "when";
+      version = "3.7.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz";
+        sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
+      };
+    };
+    "which-1.2.4" = {
+      name = "which";
+      packageName = "which";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz";
+        sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722";
+      };
+    };
+    "winreg-0.0.12" = {
+      name = "winreg";
+      packageName = "winreg";
+      version = "0.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winreg/-/winreg-0.0.12.tgz";
+        sha1 = "07105554ba1a9d08979251d129475bffae3006b7";
+      };
+    };
+    "is-absolute-0.1.7" = {
+      name = "is-absolute";
+      packageName = "is-absolute";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz";
+        sha1 = "847491119fccb5fb436217cc737f7faad50f603f";
+      };
+    };
+    "isexe-1.1.2" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz";
+        sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
+      };
+    };
+    "is-relative-0.1.3" = {
+      name = "is-relative";
+      packageName = "is-relative";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz";
+        sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82";
+      };
+    };
+    "shelljs-0.7.7" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.7.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
+        sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
+      };
+    };
+    "es6-promise-2.3.0" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
+        sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
+      };
+    };
+    "firefox-client-0.3.0" = {
+      name = "firefox-client";
+      packageName = "firefox-client";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz";
+        sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b";
+      };
+    };
+    "colors-0.5.1" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
+        sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
+      };
+    };
+    "js-select-0.6.0" = {
+      name = "js-select";
+      packageName = "js-select";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz";
+        sha1 = "c284e22824d5927aec962dcdf247174aefb0d190";
+      };
+    };
+    "traverse-0.4.6" = {
+      name = "traverse";
+      packageName = "traverse";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz";
+        sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34";
+      };
+    };
+    "JSONSelect-0.2.1" = {
+      name = "JSONSelect";
+      packageName = "JSONSelect";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz";
+        sha1 = "415418a526d33fe31d74b4defa3c836d485ec203";
+      };
+    };
+    "growly-1.3.0" = {
+      name = "growly";
+      packageName = "growly";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz";
+        sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081";
+      };
+    };
+    "shellwords-0.1.1" = {
+      name = "shellwords";
+      packageName = "shellwords";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
+        sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w";
+      };
+    };
+    "babel-polyfill-6.16.0" = {
+      name = "babel-polyfill";
+      packageName = "babel-polyfill";
+      version = "6.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz";
+        sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422";
+      };
+    };
+    "deepcopy-0.6.3" = {
+      name = "deepcopy";
+      packageName = "deepcopy";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz";
+        sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0";
+      };
+    };
+    "es6-error-4.0.0" = {
+      name = "es6-error";
+      packageName = "es6-error";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz";
+        sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40";
+      };
+    };
+    "jsonwebtoken-7.1.9" = {
+      name = "jsonwebtoken";
+      packageName = "jsonwebtoken";
+      version = "7.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz";
+        sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a";
+      };
+    };
+    "mz-2.5.0" = {
+      name = "mz";
+      packageName = "mz";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz";
+        sha1 = "2859025df03d46b57bb317174b196477ce64cec1";
+      };
+    };
+    "source-map-support-0.4.6" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz";
+        sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb";
+      };
+    };
+    "regenerator-runtime-0.9.6" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+      };
+    };
+    "joi-6.10.1" = {
+      name = "joi";
+      packageName = "joi";
+      version = "6.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz";
+        sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06";
+      };
+    };
+    "lodash.once-4.1.1" = {
+      name = "lodash.once";
+      packageName = "lodash.once";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz";
+        sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
+      };
+    };
+    "topo-1.1.0" = {
+      name = "topo";
+      packageName = "topo";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz";
+        sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5";
+      };
+    };
+    "isemail-1.2.0" = {
+      name = "isemail";
+      packageName = "isemail";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz";
+        sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a";
+      };
+    };
+    "end-of-stream-1.1.0" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
+        sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
+      };
+    };
+    "stream-to-array-2.3.0" = {
+      name = "stream-to-array";
+      packageName = "stream-to-array";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz";
+        sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353";
+      };
+    };
+    "jszip-2.6.1" = {
+      name = "jszip";
+      packageName = "jszip";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz";
+        sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0";
+      };
+    };
     "cli-list-0.2.0" = {
       name = "cli-list";
       packageName = "cli-list";
@@ -22748,13 +23900,13 @@ let
         sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "yeoman-environment-2.0.3" = {
+    "yeoman-environment-2.0.5" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.3.tgz";
-        sha512 = "3b2r95zvq77x2g2gc56l9wnd48f68qa4nkdd2yc9k04ikjwrx83ac4innjiysccdk9f0ng25a0bzxf7fs576jmjc5ww01mklrfbb1gd";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz";
+        sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb";
       };
     };
     "yosay-2.0.1" = {
@@ -23036,6 +24188,15 @@ let
         sha1 = "449ca98299e713038256289ecb2b540dc437cb30";
       };
     };
+    "log-symbols-2.1.0" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz";
+        sha512 = "36h090zjf2rfivlbhl50iymid2wggwncngy539cylicpdwrc3jvyqpxs2mmmybqjir313xs70vliczq511zypjx8jphvm006fpqpdyc";
+      };
+    };
     "mem-fs-1.1.3" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -23081,15 +24242,6 @@ let
         sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
       };
     };
-    "first-chunk-stream-2.0.0" = {
-      name = "first-chunk-stream";
-      packageName = "first-chunk-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
-        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
-      };
-    };
     "pad-component-0.0.1" = {
       name = "pad-component";
       packageName = "pad-component";
@@ -23114,10 +24266,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.10.5";
+    version = "1.10.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.5.tgz";
-      sha1 = "60d75b6b4d9094846ada57d18892a50b8c140b8c";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.7.tgz";
+      sha1 = "48e37cfbbd1bae96fba40bbffdd542577d981637";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -23162,7 +24314,7 @@ in
       sources."json5-0.5.1"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."private-0.1.7"
+      sources."private-0.1.8"
       sources."slash-1.0.0"
       sources."chalk-1.1.3"
       sources."esutils-2.0.2"
@@ -23433,11 +24585,16 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.18.1"
-      sources."ms-rest-2.2.2"
-      (sources."ms-rest-azure-2.3.3" // {
+      sources."moment-2.19.1"
+      (sources."ms-rest-2.2.3" // {
         dependencies = [
-          sources."async-0.2.7"
+          sources."moment-2.18.1"
+        ];
+      })
+      (sources."ms-rest-azure-2.4.1" // {
+        dependencies = [
+          sources."async-2.5.0"
+          sources."moment-2.18.1"
         ];
       })
       sources."node-forge-0.6.23"
@@ -23535,12 +24692,13 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-8.0.30"
-      sources."@types/request-2.0.3"
-      sources."@types/uuid-3.4.2"
+      sources."@types/node-8.0.46"
+      sources."@types/request-2.0.6"
+      sources."@types/uuid-3.4.3"
       sources."is-buffer-1.1.5"
       sources."is-stream-1.1.0"
       sources."@types/form-data-2.2.0"
+      sources."lodash-4.17.4"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.1"
@@ -23551,7 +24709,7 @@ in
         ];
       })
       sources."deep-equal-1.0.1"
-      sources."i-0.3.5"
+      sources."i-0.3.6"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."rimraf-2.6.2"
@@ -23602,7 +24760,6 @@ in
       sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.17.4"
       sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
@@ -23704,7 +24861,7 @@ in
     version = "3.2.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz";
-      sha1 = "nlzr17lidjf72s60vcsnqpjxgnnsn32s";
+      sha1 = "5a0cabad7d5d5e6c35dbc068719c6c919e903fb5";
     };
     dependencies = [
       sources."argparse-1.0.4"
@@ -23812,7 +24969,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."q-1.5.0"
+      sources."q-1.5.1"
       sources."debug-2.6.9"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -23833,10 +24990,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.4.0";
+    version = "14.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz";
-      sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz";
+      sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -23847,8 +25004,8 @@ in
           sources."resolve-1.1.7"
         ];
       })
-      sources."browserify-zlib-0.1.4"
-      sources."buffer-5.0.7"
+      sources."browserify-zlib-0.2.0"
+      sources."buffer-5.0.8"
       sources."cached-path-relative-1.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -23876,7 +25033,7 @@ in
         ];
       })
       sources."module-deps-4.1.1"
-      sources."os-browserify-0.1.2"
+      sources."os-browserify-0.3.0"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.10"
@@ -23915,7 +25072,7 @@ in
       sources."inline-source-map-0.6.2"
       sources."lodash.memoize-3.0.4"
       sources."source-map-0.5.7"
-      sources."pako-0.2.9"
+      sources."pako-1.0.6"
       sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
       sources."typedarray-0.0.6"
@@ -23933,7 +25090,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
-      sources."browserify-aes-1.0.8"
+      sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."buffer-xor-1.0.3"
@@ -23957,8 +25114,8 @@ in
           sources."hash-base-2.0.2"
         ];
       })
-      sources."sha.js-2.4.8"
-      sources."miller-rabin-4.0.0"
+      sources."sha.js-2.4.9"
+      sources."miller-rabin-4.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
@@ -24017,7 +25174,7 @@ in
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
       sources."keypress-0.2.1"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."minimist-1.2.0"
       sources."peerflix-0.34.0"
       (sources."playerui-1.2.0" // {
@@ -24309,7 +25466,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.5.2"
+      sources."ipaddr.js-1.5.4"
       sources."get-browser-rtc-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
@@ -24387,24 +25544,23 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "7.0.1";
+    version = "7.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-7.0.1.tgz";
-      sha1 = "69fd054300ce5105b092f67a1b286e80c4e88b9d";
+      url = "https://registry.npmjs.org/cordova/-/cordova-7.1.0.tgz";
+      sha1 = "559f5394e64145c9b6dd81800feb658d5087b096";
     };
     dependencies = [
       sources."configstore-2.1.0"
-      (sources."cordova-common-2.0.3" // {
+      (sources."cordova-common-2.1.1" // {
         dependencies = [
-          sources."q-1.5.0"
+          sources."q-1.5.1"
         ];
       })
-      (sources."cordova-lib-7.0.1" // {
+      (sources."cordova-lib-7.1.0" // {
         dependencies = [
           sources."glob-7.1.1"
           sources."nopt-4.0.1"
           sources."plist-2.0.1"
-          sources."semver-5.3.0"
           sources."shelljs-0.3.0"
           sources."base64-js-1.1.2"
           sources."xmlbuilder-8.2.2"
@@ -24467,22 +25623,31 @@ in
       sources."aliasify-2.1.0"
       (sources."cordova-create-1.1.1" // {
         dependencies = [
+          (sources."cordova-common-2.0.3" // {
+            dependencies = [
+              sources."q-1.5.1"
+              sources."shelljs-0.5.3"
+            ];
+          })
+          (sources."cordova-fetch-1.1.0" // {
+            dependencies = [
+              sources."q-1.5.1"
+              sources."shelljs-0.7.8"
+            ];
+          })
           sources."shelljs-0.3.0"
+          sources."glob-7.1.2"
         ];
       })
-      (sources."cordova-fetch-1.1.0" // {
+      (sources."cordova-fetch-1.2.0" // {
         dependencies = [
-          sources."q-1.5.0"
+          sources."q-1.5.1"
           sources."shelljs-0.7.8"
           sources."glob-7.1.2"
         ];
       })
-      sources."cordova-js-4.2.1"
-      (sources."cordova-serve-1.0.1" // {
-        dependencies = [
-          sources."q-1.5.0"
-        ];
-      })
+      sources."cordova-js-4.2.2"
+      sources."cordova-serve-2.0.0"
       (sources."dep-graph-1.1.0" // {
         dependencies = [
           sources."underscore-1.2.1"
@@ -24513,6 +25678,7 @@ in
           sources."validate-npm-package-name-2.2.2"
           sources."write-file-atomic-1.1.4"
           sources."isarray-1.0.0"
+          sources."string_decoder-0.10.31"
           sources."qs-6.2.3"
           sources."builtins-0.0.7"
         ];
@@ -24552,7 +25718,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."resolve-1.4.0"
       sources."path-parse-1.0.5"
-      (sources."browserify-13.3.0" // {
+      (sources."browserify-14.4.0" // {
         dependencies = [
           sources."glob-7.1.2"
         ];
@@ -24566,10 +25732,9 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      (sources."buffer-4.9.1" // {
+      (sources."buffer-5.0.8" // {
         dependencies = [
           sources."base64-js-1.2.1"
-          sources."isarray-1.0.0"
         ];
       })
       sources."cached-path-relative-1.0.1"
@@ -24577,6 +25742,7 @@ in
         dependencies = [
           sources."readable-stream-2.0.6"
           sources."isarray-1.0.0"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."console-browserify-1.1.0"
@@ -24589,7 +25755,7 @@ in
       sources."events-1.1.1"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
-      sources."https-browserify-0.0.1"
+      sources."https-browserify-1.0.0"
       sources."insert-module-globals-7.0.1"
       sources."labeled-stream-splicer-2.0.0"
       sources."module-deps-4.1.1"
@@ -24603,14 +25769,13 @@ in
       (sources."readable-stream-2.3.3" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.3"
         ];
       })
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
-      sources."string_decoder-0.10.31"
+      sources."string_decoder-1.0.3"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -24658,7 +25823,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
-      sources."browserify-aes-1.0.8"
+      sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."buffer-xor-1.0.3"
@@ -24682,8 +25847,8 @@ in
           sources."hash-base-2.0.2"
         ];
       })
-      sources."sha.js-2.4.8"
-      sources."miller-rabin-4.0.0"
+      sources."sha.js-2.4.9"
+      sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
@@ -24710,8 +25875,9 @@ in
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
-      sources."compression-1.7.0"
-      sources."express-4.15.4"
+      sources."compression-1.7.1"
+      sources."express-4.16.2"
+      sources."open-0.0.5"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -24719,16 +25885,17 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.4"
-      sources."bytes-2.5.0"
-      sources."compressible-2.0.11"
-      sources."debug-2.6.8"
+      sources."bytes-3.0.0"
+      sources."compressible-2.0.12"
+      sources."debug-2.6.9"
       sources."on-headers-1.0.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."mime-types-2.1.17"
       sources."negotiator-0.6.1"
       sources."mime-db-1.30.0"
       sources."ms-2.0.0"
       sources."array-flatten-1.1.1"
+      sources."body-parser-1.18.2"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
@@ -24737,33 +25904,35 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.6" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."fresh-0.5.0"
+      sources."finalhandler-1.1.0"
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
-      sources."qs-6.5.0"
+      sources."proxy-addr-2.0.2"
+      sources."qs-6.5.1"
       sources."range-parser-1.2.0"
-      sources."send-0.15.4"
-      sources."serve-static-1.12.4"
-      sources."setprototypeof-1.0.3"
+      sources."send-0.16.1"
+      sources."serve-static-1.13.1"
+      sources."setprototypeof-1.1.0"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
-      sources."utils-merge-1.0.0"
+      sources."utils-merge-1.0.1"
+      (sources."http-errors-1.6.2" // {
+        dependencies = [
+          sources."setprototypeof-1.0.3"
+        ];
+      })
+      sources."iconv-lite-0.4.19"
+      sources."raw-body-2.3.2"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."http-errors-1.6.2"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."media-typer-0.3.0"
       sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
@@ -24786,7 +25955,7 @@ in
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."builtins-1.0.3"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."archy-1.0.0"
@@ -24869,6 +26038,7 @@ in
         dependencies = [
           sources."readable-stream-2.0.6"
           sources."isarray-1.0.0"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."caseless-0.11.0"
@@ -25001,7 +26171,7 @@ in
       sources."timed-out-2.0.0"
       sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -25013,6 +26183,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Cordova command line interface tool";
+      homepage = "https://github.com/apache/cordova-cli#readme";
       license = "Apache-2.0";
     };
     production = true;
@@ -25153,7 +26324,7 @@ in
       sources."eventemitter3-0.1.6"
       sources."better-curry-1.6.0"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.8"
+      sources."http-parser-js-0.4.9"
       sources."websocket-extensions-0.1.2"
       (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // {
         dependencies = [
@@ -25248,7 +26419,7 @@ in
       (sources."ndjson-1.5.0" // {
         dependencies = [
           sources."minimist-1.2.0"
-          sources."split2-2.1.1"
+          sources."split2-2.2.0"
           sources."through2-2.0.3"
           sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
@@ -25280,7 +26451,7 @@ in
       sources."jsonparse-0.0.5"
       sources."through-2.3.8"
       sources."object-assign-4.1.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."inherits-2.0.3"
@@ -25361,14 +26532,10 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.122.0"
+      sources."aws-sdk-2.138.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
-      (sources."request-2.82.0" // {
-        dependencies = [
-          sources."uuid-3.1.0"
-        ];
-      })
+      sources."request-2.83.0"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."lodash-4.17.4"
@@ -25379,7 +26546,7 @@ in
       sources."querystring-0.2.0"
       sources."sax-1.2.1"
       sources."url-0.10.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."xml2js-0.4.17"
       sources."xmlbuilder-4.2.1"
       sources."base64-js-1.2.1"
@@ -25414,7 +26581,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -25464,15 +26631,15 @@ in
     dependencies = [
       sources."auto-bind-1.1.0"
       sources."clipboardy-1.1.4"
-      sources."conf-1.3.0"
+      sources."conf-1.3.1"
       sources."got-7.1.0"
       sources."has-ansi-3.0.0"
       sources."import-jsx-1.3.0"
       (sources."ink-0.3.1" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
         ];
       })
       sources."ink-text-input-1.1.1"
@@ -25502,11 +26669,11 @@ in
       sources."path-key-2.0.1"
       sources."dot-prop-4.2.0"
       sources."env-paths-1.0.0"
-      sources."make-dir-1.0.0"
+      sources."make-dir-1.1.0"
       sources."pkg-up-2.0.0"
       sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."find-up-2.1.0"
       sources."locate-path-2.0.0"
       sources."p-locate-2.0.0"
@@ -25555,7 +26722,7 @@ in
       sources."lodash-4.17.4"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."private-0.1.7"
+      sources."private-0.1.8"
       sources."slash-1.0.0"
       sources."source-map-0.5.7"
       (sources."chalk-1.1.3" // {
@@ -25605,12 +26772,12 @@ in
       sources."indent-string-3.2.0"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
-      sources."log-update-2.1.0"
-      sources."prop-types-15.5.10"
+      sources."log-update-2.2.0"
+      sources."prop-types-15.6.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
-      sources."ansi-escapes-2.0.0"
+      sources."ansi-escapes-3.0.0"
       sources."cli-cursor-2.1.0"
       (sources."wrap-ansi-3.0.1" // {
         dependencies = [
@@ -25626,16 +26793,16 @@ in
         ];
       })
       sources."is-fullwidth-code-point-2.0.0"
-      (sources."fbjs-0.8.15" // {
+      (sources."fbjs-0.8.16" // {
         dependencies = [
           sources."core-js-1.2.7"
         ];
       })
-      sources."isomorphic-fetch-2.2.1"
       sources."object-assign-4.1.1"
+      sources."isomorphic-fetch-2.2.1"
       sources."promise-7.3.1"
       sources."setimmediate-1.0.5"
-      sources."ua-parser-js-0.7.14"
+      sources."ua-parser-js-0.7.17"
       sources."node-fetch-1.7.3"
       sources."whatwg-fetch-2.0.3"
       sources."encoding-0.1.12"
@@ -25672,8 +26839,16 @@ in
       sources."read-pkg-1.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      (sources."path-type-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."parse-json-2.2.0"
       sources."strip-bom-2.0.0"
       sources."error-ex-1.3.1"
@@ -25694,28 +26869,28 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.7.2";
+    version = "4.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.7.2.tgz";
-      sha1 = "ff6f5f5193848a27ee9b627be3e73fb9cb5e662e";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz";
+      sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b";
     };
     dependencies = [
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
           sources."chalk-1.1.3"
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."chalk-2.1.0" // {
+      (sources."chalk-2.2.0" // {
         dependencies = [
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
         ];
       })
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
-      sources."debug-3.0.1"
+      sources."debug-3.1.0"
       sources."doctrine-2.0.0"
       sources."eslint-scope-3.7.1"
       sources."espree-3.5.1"
@@ -25726,7 +26901,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.5"
+      sources."ignore-3.3.6"
       sources."imurmurhash-0.1.4"
       sources."inquirer-3.3.0"
       sources."is-resolvable-1.0.0"
@@ -25749,13 +26924,7 @@ in
         ];
       })
       sources."strip-json-comments-2.0.1"
-      (sources."table-4.0.1" // {
-        dependencies = [
-          sources."ajv-4.11.8"
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."table-4.0.2"
       sources."text-table-0.2.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -25794,7 +26963,7 @@ in
           sources."acorn-3.3.0"
         ];
       })
-      sources."flat-cache-1.2.2"
+      sources."flat-cache-1.3.0"
       sources."circular-json-0.3.3"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
@@ -25853,13 +27022,13 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-keywords-1.5.1"
-      sources."slice-ansi-0.0.4"
+      sources."ajv-keywords-2.1.0"
+      sources."slice-ansi-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "An AST-based pattern checker for JavaScript.";
-      homepage = http://eslint.org/;
+      homepage = https://eslint.org/;
       license = "MIT";
     };
     production = true;
@@ -25878,12 +27047,12 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."eslint-4.7.2" // {
+      (sources."eslint-4.9.0" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -25899,11 +27068,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."ansi-regex-2.1.1"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."babel-code-frame-6.26.0"
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
-      sources."debug-3.0.1"
+      sources."debug-3.1.0"
       sources."doctrine-2.0.0"
       sources."eslint-scope-3.7.1"
       sources."espree-3.5.1"
@@ -25914,14 +27083,14 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.5"
+      sources."ignore-3.3.6"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-3.3.0" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -25939,9 +27108,11 @@ in
       sources."require-uncached-1.0.3"
       sources."semver-5.4.1"
       sources."strip-json-comments-2.0.1"
-      (sources."table-4.0.1" // {
+      (sources."table-4.0.2" // {
         dependencies = [
-          sources."ajv-4.11.8"
+          sources."chalk-2.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
         ];
       })
       sources."text-table-0.2.0"
@@ -25977,7 +27148,7 @@ in
           sources."acorn-3.3.0"
         ];
       })
-      sources."flat-cache-1.2.2"
+      sources."flat-cache-1.3.0"
       sources."circular-json-0.3.3"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
@@ -26038,8 +27209,8 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-keywords-1.5.1"
-      sources."slice-ansi-0.0.4"
+      sources."ajv-keywords-2.1.0"
+      sources."slice-ansi-1.0.0"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
       sources."fast-levenshtein-2.0.6"
@@ -26071,36 +27242,43 @@ in
   fast-cli = nodeEnv.buildNodePackage {
     name = "fast-cli";
     packageName = "fast-cli";
-    version = "1.0.0";
+    version = "2.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz";
-      sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
+      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-2.0.0.tgz";
+      sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x";
     };
     dependencies = [
-      sources."chalk-1.1.3"
-      sources."log-update-1.0.2"
+      sources."chalk-2.2.0"
+      sources."log-update-2.2.0"
       sources."meow-3.7.0"
       (sources."ora-1.3.0" // {
         dependencies = [
-          sources."cli-cursor-2.1.0"
-          sources."restore-cursor-2.0.0"
-          sources."onetime-2.0.1"
+          sources."chalk-1.1.3"
+          sources."ansi-styles-2.2.1"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+          sources."ansi-regex-2.1.1"
         ];
       })
-      sources."phantomjs-prebuilt-2.1.15"
-      sources."promise-phantom-3.1.6"
+      sources."puppeteer-0.11.0"
       sources."zen-observable-0.5.2"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       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.1.1"
-      sources."ansi-escapes-1.4.0"
-      sources."cli-cursor-1.0.2"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
+      sources."supports-color-4.5.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."ansi-escapes-3.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."wrap-ansi-3.0.1"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."signal-exit-3.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."string-width-2.1.1"
+      sources."strip-ansi-4.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."ansi-regex-3.0.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -26113,7 +27291,6 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
@@ -26143,20 +27320,36 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
-      sources."cli-spinners-1.0.1"
-      sources."log-symbols-1.0.2"
-      sources."mimic-fn-1.1.0"
-      sources."es6-promise-4.0.5"
-      sources."extract-zip-1.6.5"
-      sources."fs-extra-1.0.0"
-      sources."hasha-2.2.0"
-      sources."kew-0.7.0"
-      sources."progress-1.1.8"
-      sources."request-2.81.0"
-      sources."request-progress-2.0.1"
-      sources."which-1.2.14"
+      sources."cli-spinners-1.1.0"
+      (sources."log-symbols-1.0.2" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+          sources."ansi-styles-2.2.1"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."debug-2.6.9"
+      (sources."extract-zip-1.6.5" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."https-proxy-agent-2.1.0"
+      sources."mime-1.4.1"
+      sources."progress-2.0.0"
+      sources."proxy-from-env-1.0.0"
+      sources."rimraf-2.6.2"
+      sources."ws-3.2.0"
+      sources."ms-2.0.0"
       sources."concat-stream-1.6.0"
-      sources."debug-2.2.0"
       (sources."mkdirp-0.5.0" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -26172,85 +27365,23 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."ms-0.7.1"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."jsonfile-2.4.0"
-      sources."klaw-1.3.1"
-      sources."is-stream-1.1.0"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      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.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
-      sources."co-4.6.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      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.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."throttleit-1.0.0"
-      sources."isexe-2.0.0"
-      sources."mkpath-1.0.0"
-      sources."node-phantom-simple-2.2.4"
-      sources."tmp-0.0.31"
-      sources."os-tmpdir-1.0.2"
+      sources."agent-base-4.1.1"
+      sources."es6-promisify-5.0.0"
+      sources."es6-promise-4.1.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."async-limiter-1.0.0"
+      sources."ultron-1.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26421,7 +27552,7 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -26432,7 +27563,7 @@ in
       sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -26550,7 +27681,7 @@ in
       sources."defined-0.0.0"
       sources."through-2.3.8"
       sources."resumer-0.0.0"
-      sources."i-0.3.5"
+      sources."i-0.3.6"
       sources."ncp-0.4.2"
     ];
     buildInputs = globalBuildInputs;
@@ -26564,19 +27695,19 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.4";
+    version = "0.5.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz";
-      sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz";
+      sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g";
     };
     dependencies = [
       sources."async-2.5.0"
       sources."lodash.groupby-4.6.0"
-      sources."minilog-2.0.8"
-      sources."simple-git-1.77.0"
+      sources."minilog-3.1.0"
+      sources."simple-git-1.80.1"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
-      sources."microee-0.0.2"
+      sources."microee-0.0.6"
       sources."debug-2.6.9"
       sources."ms-2.0.0"
     ];
@@ -26627,7 +27758,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27069,33 +28200,33 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "3.12.0";
+    version = "3.13.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-3.12.0.tgz";
-      sha512 = "0x1177vl5qkcwx2fw8nbg227ymhzx80pfjxpiw4xdhfrmqdzrlfz38kk8z1x6ifvg9mij2m8ws6wvjczpp2shqdqmgjibg3xkabsrbb";
+      url = "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz";
+      sha512 = "2wd7s9cn0x8ig8dpajdk40ssym0byplr6qv8gd2ppb96r4cyhmx519k8m0skdzdir02d5ady9hbaz90jcfl4j1zfzibjjwr9g8rddb1";
     };
     dependencies = [
-      sources."@ionic/cli-utils-1.12.0"
-      sources."@ionic/discover-0.3.1"
-      sources."chalk-2.1.0"
+      sources."@ionic/cli-utils-1.13.1"
+      sources."@ionic/discover-0.3.3"
+      sources."chalk-2.2.0"
       sources."opn-5.1.0"
       sources."os-name-2.0.1"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      sources."tslib-1.7.1"
-      sources."archiver-2.0.3"
+      sources."tslib-1.8.0"
+      sources."archiver-2.1.0"
       sources."basic-auth-1.1.0"
       sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       sources."ci-info-1.1.1"
       sources."cross-spawn-5.1.0"
       sources."dargs-5.1.0"
-      sources."diff-3.3.1"
+      sources."diff-3.4.0"
       sources."elementtree-0.1.7"
-      (sources."express-4.15.4" // {
+      (sources."express-4.16.2" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."qs-6.5.0"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.3.1"
         ];
       })
       sources."inquirer-3.3.0"
@@ -27109,7 +28240,7 @@ in
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      sources."ssh-config-1.1.2"
+      sources."ssh-config-1.1.3"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -27120,9 +28251,10 @@ in
           sources."ansi-regex-3.0.0"
         ];
       })
-      (sources."superagent-3.6.0" // {
+      (sources."superagent-3.7.0" // {
         dependencies = [
-          sources."mime-1.4.0"
+          sources."debug-3.1.0"
+          sources."form-data-2.3.1"
         ];
       })
       sources."tar-2.2.1"
@@ -27137,7 +28269,6 @@ in
       sources."readable-stream-2.3.3"
       sources."tar-stream-1.5.4"
       sources."zip-stream-1.2.0"
-      sources."walkdir-0.0.11"
       sources."graceful-fs-4.1.11"
       sources."lazystream-1.0.0"
       sources."normalize-path-2.1.1"
@@ -27161,9 +28292,9 @@ in
       sources."bl-1.2.1"
       sources."end-of-stream-1.4.0"
       sources."xtend-4.0.1"
-      sources."compress-commons-1.2.0"
+      sources."compress-commons-1.2.2"
       sources."crc32-stream-2.0.0"
-      sources."crc-3.4.4"
+      sources."crc-3.5.0"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
       sources."debug-2.6.9"
@@ -27176,7 +28307,7 @@ in
       sources."type-is-1.6.15"
       sources."ms-2.0.0"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -27239,7 +28370,7 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       (sources."request-2.81.0" // {
         dependencies = [
           sources."qs-6.4.0"
@@ -27247,7 +28378,7 @@ in
       })
       sources."hawk-3.1.3"
       sources."tar-pack-3.4.0"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -27359,27 +28490,31 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.6"
-      sources."fresh-0.5.0"
+      (sources."finalhandler-1.1.0" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
+      sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.16.1" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."statuses-1.3.1"
         ];
       })
-      sources."serve-static-1.12.4"
-      sources."utils-merge-1.0.0"
-      sources."vary-1.1.1"
+      sources."serve-static-1.13.1"
+      sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."ansi-escapes-3.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -27427,13 +28562,13 @@ in
       sources."safe-json-parse-1.0.1"
       sources."string-template-0.2.1"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.8"
+      sources."http-parser-js-0.4.9"
       sources."websocket-extensions-0.1.2"
       sources."async-limiter-1.0.0"
       sources."ultron-1.1.0"
       sources."netmask-1.0.6"
       sources."ansi-styles-3.2.0"
-      sources."supports-color-4.4.0"
+      sources."supports-color-4.5.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27479,7 +28614,7 @@ in
       sources."escodegen-1.8.1"
       sources."esprima-2.7.3"
       sources."glob-5.0.15"
-      (sources."handlebars-4.0.10" // {
+      (sources."handlebars-4.0.11" // {
         dependencies = [
           sources."source-map-0.4.4"
         ];
@@ -27563,18 +28698,18 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.3.1";
+    version = "2.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.3.1.tgz";
-      sha1 = "b7db14bee9db6497788e2f5a7d49db2b7a2e1891";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.2.tgz";
+      sha512 = "2vlp1rxalykzb0qwn4sv1pk58ph37nhaqqgnih83i39msplqh826dvbdd4j1791hl2almpj9g1snhdfy89cyn8y86bz7bcbr9mh6aih";
     };
     dependencies = [
-      sources."@reactivex/rxjs-5.4.3"
+      sources."@reactivex/rxjs-5.5.0"
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.1.0"
+      sources."chalk-2.2.0"
       sources."commander-2.11.0"
-      sources."fast-json-patch-2.0.5"
+      sources."fast-json-patch-2.0.6"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
       (sources."jaeger-client-3.5.3" // {
@@ -27584,12 +28719,12 @@ in
       })
       sources."lodash-4.17.4"
       sources."mz-2.7.0"
-      sources."object-hash-1.1.8"
+      sources."object-hash-1.2.0"
       sources."opentracing-0.14.1"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
-      sources."typescript-2.3.4"
-      sources."vscode-jsonrpc-3.4.0"
+      sources."typescript-2.4.2"
+      sources."vscode-jsonrpc-3.4.1"
       sources."vscode-languageserver-3.4.3"
       sources."vscode-languageserver-types-3.4.0"
       sources."symbol-observable-1.0.4"
@@ -27601,7 +28736,7 @@ in
       sources."type-detect-4.0.3"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
+      sources."supports-color-4.5.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27630,7 +28765,7 @@ in
       sources."thenify-all-1.6.0"
       sources."thenify-3.3.0"
       sources."vscode-uri-1.0.1"
-      sources."vscode-languageserver-protocol-3.4.2"
+      sources."vscode-languageserver-protocol-3.4.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27728,10 +28863,10 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.7.3";
+    version = "1.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.3.tgz";
-      sha512 = "18pcdycadk2ijyxsgl2kr14hzf75cwp4va0laidqls6haq3h0laj6f7kbbl27mwicqxi3zdin1c34w20ag1ikpm830nffdlif86qgwr";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.4.tgz";
+      sha512 = "0m3jydg8rd5is3021z595lfrm9qc6398r2nppar8xvx5m0y4q9dlac7hmm7rkyffn3ss5fn8s5zmz7d4fw1bi8q1z4lz5s8x61zb1g9";
     };
     dependencies = [
       sources."config-chain-1.1.11"
@@ -27740,14 +28875,14 @@ in
       sources."nopt-3.0.6"
       sources."proto-list-1.2.4"
       sources."ini-1.3.4"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."commander-2.11.0"
       sources."lru-cache-3.2.0"
       sources."semver-5.4.1"
       sources."sigmund-1.0.1"
       sources."pseudomap-1.0.2"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27799,10 +28934,10 @@ in
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
     packageName = "json-refs";
-    version = "3.0.0";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.0.tgz";
-      sha1 = "1b52b826691862b4873224bc1d07a2060645663c";
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz";
+      sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5";
     };
     dependencies = [
       sources."commander-2.11.0"
@@ -27810,21 +28945,21 @@ in
       sources."js-yaml-3.10.0"
       sources."lodash-4.17.4"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.2"
+      sources."path-loader-1.0.4"
       sources."slash-1.0.0"
       sources."uri-js-3.0.2"
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
-      sources."superagent-3.6.0"
+      sources."superagent-3.7.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."extend-3.0.1"
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
       sources."methods-1.1.2"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."qs-6.5.1"
       sources."readable-stream-2.3.3"
       sources."ms-2.0.0"
@@ -27861,19 +28996,14 @@ in
     dependencies = [
       sources."body-parser-1.18.2"
       sources."chalk-1.1.3"
-      (sources."compression-1.7.0" // {
-        dependencies = [
-          sources."bytes-2.5.0"
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."compression-1.7.1"
       sources."connect-pause-0.1.1"
       sources."cors-2.8.4"
       sources."errorhandler-1.5.0"
-      (sources."express-4.15.4" // {
+      (sources."express-4.16.2" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."qs-6.5.0"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.3.1"
         ];
       })
       (sources."express-urlrewrite-1.2.0" // {
@@ -27885,20 +29015,12 @@ in
       sources."lodash-4.17.4"
       sources."lodash-id-0.13.0"
       sources."lowdb-0.15.5"
-      (sources."method-override-2.3.9" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
-      (sources."morgan-1.8.2" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."method-override-2.3.10"
+      sources."morgan-1.9.0"
       sources."object-assign-4.1.1"
       sources."please-upgrade-node-3.0.1"
       sources."pluralize-3.1.0"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."server-destroy-1.0.1"
       sources."shortid-2.2.8"
       sources."update-notifier-1.0.3"
@@ -27920,7 +29042,7 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -27933,10 +29055,10 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.4"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."escape-html-1.0.3"
       sources."array-flatten-1.1.1"
@@ -27945,31 +29067,35 @@ in
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.6"
-      sources."fresh-0.5.0"
+      (sources."finalhandler-1.1.0" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
+      sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.16.1" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."statuses-1.3.1"
         ];
       })
-      sources."serve-static-1.12.4"
-      sources."utils-merge-1.0.0"
+      sources."serve-static-1.13.1"
+      sources."utils-merge-1.0.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."isarray-0.0.1"
       sources."jju-1.3.0"
       sources."graceful-fs-4.1.11"
       sources."is-promise-2.1.0"
       sources."steno-0.4.4"
-      sources."basic-auth-1.1.0"
+      sources."basic-auth-2.0.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -27991,7 +29117,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -28084,7 +29210,7 @@ in
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -28165,7 +29291,7 @@ in
       sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk";
     };
     dependencies = [
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
       sources."colors-1.1.2"
@@ -28199,7 +29325,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."minimatch-3.0.4"
       sources."optimist-0.6.1"
       sources."qjobs-1.1.5"
@@ -28229,7 +29355,7 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -28297,7 +29423,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -28312,7 +29438,7 @@ in
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -28404,7 +29530,11 @@ in
       sources."once-1.4.0"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      sources."finalhandler-1.0.6"
+      (sources."finalhandler-1.0.6" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
       sources."parseurl-1.3.2"
       sources."utils-merge-1.0.1"
       sources."encodeurl-1.0.1"
@@ -28563,10 +29693,10 @@ in
       })
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.9" // {
+      (sources."method-override-2.3.10" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."vary-1.1.1"
+          sources."debug-2.6.9"
+          sources."vary-1.1.2"
           sources."ms-2.0.0"
         ];
       })
@@ -28611,7 +29741,7 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."mime-types-2.1.17"
       sources."negotiator-0.5.3"
       sources."mime-db-1.30.0"
@@ -28624,7 +29754,7 @@ in
       sources."crc-3.3.0"
       sources."base64-url-1.2.1"
       sources."inherits-2.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."readable-stream-1.1.14"
       sources."stream-counter-0.2.0"
       sources."core-util-is-1.0.2"
@@ -28657,19 +29787,19 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.2.0";
+    version = "2.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.2.0.tgz";
-      sha512 = "1dcq9rq01bw9g2yqljwf4lmp7x9wzn5bq8yy2x0sjxc9xdr024924ay6a52grjc0lymqs8rj6320kr4xm438qc4xy4yp2xg9crjh82f";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.4.0.tgz";
+      sha512 = "0w40hmc0gkfhxzk4pfzd3wdiqb36jwr6g0ppmlp8zll9fj55sc63lm0yp3y3192gpwv5izwh4rd8qk97z2f41akp8lqb17f8d5hi6l6";
     };
     dependencies = [
       sources."async-1.5.2"
-      sources."chalk-2.1.0"
+      sources."chalk-2.2.0"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
-      sources."conventional-changelog-cli-1.3.3"
-      sources."conventional-recommended-bump-1.0.1"
+      sources."conventional-changelog-cli-1.3.4"
+      sources."conventional-recommended-bump-1.0.2"
       sources."dedent-0.7.0"
       sources."execa-0.8.0"
       sources."find-up-2.1.0"
@@ -28679,6 +29809,7 @@ in
       sources."glob-parent-3.1.0"
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
+      sources."hosted-git-info-2.5.0"
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
@@ -28720,12 +29851,12 @@ in
         ];
       })
       sources."write-file-atomic-2.3.0"
-      sources."write-json-file-2.2.0"
-      (sources."write-pkg-3.1.0" // {
+      (sources."write-json-file-2.3.0" // {
         dependencies = [
-          sources."sort-keys-2.0.0"
+          sources."pify-3.0.0"
         ];
       })
+      sources."write-pkg-3.1.0"
       (sources."yargs-8.0.2" // {
         dependencies = [
           sources."camelcase-4.1.0"
@@ -28740,7 +29871,7 @@ in
       })
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
+      sources."supports-color-4.5.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -28752,30 +29883,30 @@ in
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."add-stream-1.0.0"
-      sources."conventional-changelog-1.1.5"
+      sources."conventional-changelog-1.1.6"
       (sources."meow-3.7.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."tempfile-1.1.1"
-      sources."conventional-changelog-angular-1.5.0"
+      sources."conventional-changelog-angular-1.5.1"
       sources."conventional-changelog-atom-0.1.1"
       sources."conventional-changelog-codemirror-0.2.0"
-      (sources."conventional-changelog-core-1.9.1" // {
+      (sources."conventional-changelog-core-1.9.2" // {
         dependencies = [
           sources."read-pkg-1.1.0"
           sources."load-json-file-1.1.0"
         ];
       })
-      sources."conventional-changelog-ember-0.2.7"
+      sources."conventional-changelog-ember-0.2.8"
       sources."conventional-changelog-eslint-0.2.0"
       sources."conventional-changelog-express-0.2.0"
       sources."conventional-changelog-jquery-0.1.0"
       sources."conventional-changelog-jscs-0.1.0"
       sources."conventional-changelog-jshint-0.2.0"
       sources."compare-func-1.3.2"
-      sources."q-1.5.0"
+      sources."q-1.5.1"
       sources."array-ify-1.0.0"
       sources."dot-prop-3.0.0"
       sources."is-obj-1.0.1"
@@ -28785,7 +29916,7 @@ in
       sources."get-pkg-repo-1.4.0"
       sources."git-raw-commits-1.2.0"
       sources."git-remote-origin-url-2.0.0"
-      sources."git-semver-tags-1.2.1"
+      sources."git-semver-tags-1.2.2"
       sources."normalize-package-data-2.4.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
@@ -28797,7 +29928,7 @@ in
       })
       sources."through2-2.0.3"
       sources."conventional-commits-filter-1.0.0"
-      sources."handlebars-4.0.10"
+      sources."handlebars-4.0.11"
       sources."json-stringify-safe-5.0.1"
       sources."split-1.0.1"
       sources."is-subset-0.1.1"
@@ -28832,13 +29963,12 @@ in
       sources."through-2.3.8"
       sources."JSONStream-1.3.1"
       sources."is-text-path-1.0.1"
-      sources."split2-2.1.1"
+      sources."split2-2.2.0"
       sources."trim-off-newlines-1.0.1"
       sources."jsonparse-1.3.1"
-      sources."text-extensions-1.6.0"
+      sources."text-extensions-1.7.0"
       sources."get-stdin-4.0.1"
       sources."parse-github-repo-url-1.4.1"
-      sources."hosted-git-info-2.5.0"
       sources."dargs-4.1.0"
       sources."lodash.template-4.4.0"
       sources."number-is-nan-1.0.1"
@@ -28965,12 +30095,16 @@ in
       sources."code-point-at-1.1.0"
       sources."byline-5.0.0"
       sources."duplexer-0.1.1"
-      sources."moment-2.18.1"
-      sources."make-dir-1.0.0"
+      sources."moment-2.19.1"
+      (sources."make-dir-1.1.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."temp-dir-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."detect-indent-5.0.0"
-      sources."sort-keys-1.1.2"
+      sources."sort-keys-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."get-caller-file-1.0.2"
       (sources."os-locale-2.1.0" // {
@@ -29157,10 +30291,10 @@ in
     dependencies = [
       sources."body-parser-1.18.2"
       sources."chokidar-1.7.0"
-      (sources."express-4.15.4" // {
+      (sources."express-4.16.2" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."qs-6.5.0"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.3.1"
         ];
       })
       sources."markdown-it-8.4.0"
@@ -29169,7 +30303,7 @@ in
       sources."markdown-it-task-checkbox-1.0.4"
       sources."minimist-1.2.0"
       sources."opn-5.1.0"
-      (sources."request-2.82.0" // {
+      (sources."request-2.83.0" // {
         dependencies = [
           sources."aws-sign2-0.7.0"
           sources."form-data-2.3.1"
@@ -29177,7 +30311,7 @@ in
           sources."hawk-6.0.2"
           sources."http-signature-1.2.0"
           sources."performance-now-2.1.0"
-          sources."ajv-5.2.2"
+          sources."ajv-5.2.4"
           sources."har-schema-2.0.0"
           sources."hoek-4.2.0"
           sources."boom-4.3.1"
@@ -29190,7 +30324,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."socket.io-2.0.3"
+      sources."socket.io-2.0.4"
       sources."bytes-3.0.0"
       sources."content-type-1.0.4"
       sources."debug-2.6.9"
@@ -29204,7 +30338,7 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -29287,13 +30421,13 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."hawk-3.1.3"
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -29396,27 +30530,31 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.6"
-      sources."fresh-0.5.0"
+      (sources."finalhandler-1.1.0" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
+      sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.16.1" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."statuses-1.3.1"
         ];
       })
-      sources."serve-static-1.12.4"
-      sources."utils-merge-1.0.0"
-      sources."vary-1.1.1"
+      sources."serve-static-1.13.1"
+      sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."argparse-1.0.9"
       sources."entities-1.1.1"
       sources."linkify-it-2.0.3"
@@ -29430,13 +30568,13 @@ in
       sources."is-wsl-1.1.0"
       sources."fast-deep-equal-1.0.0"
       sources."json-schema-traverse-0.3.1"
-      (sources."engine.io-3.1.1" // {
+      (sources."engine.io-3.1.3" // {
         dependencies = [
           sources."accepts-1.3.3"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      sources."socket.io-client-2.0.3"
+      sources."socket.io-client-2.0.4"
       (sources."socket.io-parser-3.1.2" // {
         dependencies = [
           sources."isarray-2.0.1"
@@ -29463,7 +30601,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      sources."engine.io-client-3.1.1"
+      sources."engine.io-client-3.1.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
       sources."object-component-0.0.3"
@@ -29471,8 +30609,7 @@ in
       sources."parseuri-0.0.5"
       sources."to-array-0.1.4"
       sources."component-inherit-0.0.3"
-      sources."parsejson-0.0.3"
-      sources."xmlhttprequest-ssl-1.5.3"
+      sources."xmlhttprequest-ssl-1.5.4"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
@@ -29506,20 +30643,12 @@ in
       sources."event-stream-3.3.4"
       sources."faye-websocket-0.11.1"
       sources."http-auth-3.1.3"
-      (sources."morgan-1.8.2" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."morgan-1.9.0"
       sources."object-assign-4.1.1"
       sources."opn-5.1.0"
       sources."proxy-middleware-0.15.0"
-      sources."send-0.15.6"
-      (sources."serve-index-1.9.0" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."send-0.16.1"
+      sources."serve-index-1.9.1"
       sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -29589,7 +30718,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -29601,7 +30730,7 @@ in
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -29713,7 +30842,7 @@ in
       sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."through-2.3.8"
       sources."duplexer-0.1.1"
       sources."from-0.1.7"
@@ -29722,13 +30851,13 @@ in
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
       sources."websocket-driver-0.7.0"
-      sources."http-parser-js-0.4.8"
+      sources."http-parser-js-0.4.9"
       sources."websocket-extensions-0.1.2"
       sources."apache-crypt-1.2.1"
       sources."apache-md5-1.1.2"
       sources."bcryptjs-2.4.3"
       sources."unix-crypt-td-js-1.0.0"
-      sources."basic-auth-1.1.0"
+      sources."basic-auth-2.0.0"
       sources."depd-1.1.1"
       sources."on-headers-1.0.1"
       sources."is-wsl-1.1.0"
@@ -29737,7 +30866,7 @@ in
       sources."etag-1.8.1"
       sources."fresh-0.5.2"
       sources."http-errors-1.6.2"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."range-parser-1.2.0"
       sources."setprototypeof-1.0.3"
       sources."accepts-1.3.4"
@@ -29790,25 +30919,22 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "3.5.3";
+    version = "4.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz";
-      sha512 = "093v1508xiyy2l0fp2c0rv9qc0jdhi4hz2xil2zyawjvcmag11scslkkyzv2cqwhh24b7ijhbhr3jbyidamgkhiccnn29ac9p9xmagz";
+      url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz";
+      sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
-      sources."commander-2.9.0"
-      sources."debug-2.6.8"
-      sources."diff-3.2.0"
+      sources."commander-2.11.0"
+      sources."debug-3.1.0"
+      sources."diff-3.3.1"
       sources."escape-string-regexp-1.0.5"
-      sources."glob-7.1.1"
-      sources."growl-1.9.2"
+      sources."glob-7.1.2"
+      sources."growl-1.10.3"
       sources."he-1.1.1"
-      sources."json3-3.3.2"
-      sources."lodash.create-3.1.1"
       sources."mkdirp-0.5.1"
-      sources."supports-color-3.1.2"
-      sources."graceful-readlink-1.0.1"
+      sources."supports-color-4.4.0"
       sources."ms-2.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -29820,16 +30946,8 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."lodash._baseassign-3.2.0"
-      sources."lodash._basecreate-3.0.3"
-      sources."lodash._isiterateecall-3.0.9"
-      sources."lodash._basecopy-3.0.1"
-      sources."lodash.keys-3.1.2"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isarray-3.0.4"
       sources."minimist-0.0.8"
-      sources."has-flag-1.0.0"
+      sources."has-flag-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29856,19 +30974,19 @@ in
       sources."sprintf-js-1.0.3"
       sources."graphlib-2.1.1"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.2"
+      sources."path-loader-1.0.4"
       sources."slash-1.0.0"
       sources."uri-js-3.0.2"
       sources."lodash-4.17.4"
-      sources."superagent-3.6.0"
+      sources."superagent-3.7.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."extend-3.0.1"
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
       sources."methods-1.1.2"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."qs-6.5.1"
       sources."readable-stream-2.3.3"
       sources."ms-2.0.0"
@@ -29896,10 +31014,10 @@ in
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
-    version = "0.0.24";
+    version = "0.0.25";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nijs/-/nijs-0.0.24.tgz";
-      sha1 = "6581de112f5810c9930d5fcdf772f67787e797eb";
+      url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
+      sha1 = "04b035cb530d46859d1018839a518c029133f676";
     };
     dependencies = [
       sources."optparse-1.0.5"
@@ -29947,7 +31065,7 @@ in
       sources."normalize-package-data-2.4.0"
       sources."npm-package-arg-5.1.2"
       sources."once-1.4.0"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."retry-0.10.1"
       sources."slide-1.1.6"
       sources."ssri-4.1.6"
@@ -29997,7 +31115,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -30050,9 +31168,9 @@ in
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."minipass-2.2.1"
-      sources."minizlib-1.0.3"
+      sources."minizlib-1.0.4"
       sources."yallist-3.0.2"
       sources."rimraf-2.2.8"
       (sources."fs-extra-0.6.4" // {
@@ -30090,7 +31208,7 @@ in
       sources."nopt-3.0.6"
       sources."npmlog-4.1.2"
       sources."osenv-0.1.4"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."rimraf-2.6.2"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
@@ -30105,7 +31223,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.4"
@@ -30154,7 +31272,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -30207,20 +31325,12 @@ in
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
       sources."debug-2.6.9"
-      (sources."express-4.15.4" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."express-4.16.2"
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.4" // {
-        dependencies = [
-          sources."fresh-0.5.1"
-        ];
-      })
+      sources."serve-favicon-2.4.5"
       sources."strong-data-uri-1.0.4"
       sources."v8-debug-1.0.1"
       sources."v8-profiler-5.7.0"
@@ -30306,6 +31416,7 @@ in
       sources."ms-2.0.0"
       sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
+      sources."body-parser-1.18.2"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
@@ -30314,38 +31425,42 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."finalhandler-1.0.6"
-      sources."fresh-0.5.0"
+      sources."finalhandler-1.1.0"
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
-      sources."qs-6.5.0"
+      sources."proxy-addr-2.0.2"
+      sources."qs-6.5.1"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
-      sources."serve-static-1.12.4"
-      sources."setprototypeof-1.0.3"
+      sources."safe-buffer-5.1.1"
+      sources."send-0.16.1"
+      sources."serve-static-1.13.1"
+      sources."setprototypeof-1.1.0"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
-      sources."utils-merge-1.0.0"
-      sources."vary-1.1.1"
+      sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
       sources."mime-types-2.1.17"
       sources."negotiator-0.6.1"
       sources."mime-db-1.30.0"
+      sources."bytes-3.0.0"
+      (sources."http-errors-1.6.2" // {
+        dependencies = [
+          sources."setprototypeof-1.0.3"
+        ];
+      })
+      sources."iconv-lite-0.4.19"
+      sources."raw-body-2.3.2"
+      sources."inherits-2.0.3"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."http-errors-1.6.2"
-      sources."mime-1.3.4"
-      sources."inherits-2.0.3"
+      sources."mime-1.4.1"
       sources."media-typer-0.3.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
@@ -30357,7 +31472,6 @@ in
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
-      sources."safe-buffer-5.1.1"
       sources."truncate-1.0.5"
       sources."nan-2.7.0"
       (sources."node-pre-gyp-0.6.38" // {
@@ -30382,7 +31496,7 @@ in
           sources."glob-7.1.2"
         ];
       })
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.4"
@@ -30499,7 +31613,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -30511,7 +31625,7 @@ in
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -30656,7 +31770,7 @@ in
         ];
       })
       sources."undefsafe-0.0.3"
-      sources."update-notifier-2.2.0"
+      sources."update-notifier-2.3.0"
       sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -30722,7 +31836,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -30734,7 +31848,7 @@ in
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -30855,23 +31969,18 @@ in
       sources."pause-stream-0.0.11"
       sources."split-0.3.3"
       sources."stream-combiner-0.0.4"
-      (sources."boxen-1.2.1" // {
+      (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.1.0"
           sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
         ];
       })
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-2.2.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
@@ -30888,12 +31997,6 @@ in
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
       sources."widest-line-1.0.0"
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -30909,15 +32012,23 @@ in
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
       sources."path-key-2.0.1"
-      sources."has-ansi-2.0.0"
+      sources."ansi-styles-3.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.5.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."dot-prop-4.2.0"
-      sources."make-dir-1.0.0"
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
+      sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
@@ -30959,7 +32070,11 @@ in
       sources."cookie-parser-1.4.3"
       sources."cors-2.8.3"
       sources."cron-1.2.1"
-      sources."express-4.15.3"
+      (sources."express-4.15.3" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
       (sources."express-session-1.15.2" // {
         dependencies = [
           sources."debug-2.6.3"
@@ -31004,7 +32119,7 @@ in
       sources."node-red-node-email-0.1.24"
       (sources."node-red-node-twitter-0.1.11" // {
         dependencies = [
-          sources."request-2.82.0"
+          sources."request-2.83.0"
           sources."aws-sign2-0.7.0"
           sources."caseless-0.12.0"
           sources."form-data-2.3.1"
@@ -31038,7 +32153,7 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."mime-types-2.1.17"
       sources."mime-db-1.30.0"
@@ -31077,9 +32192,9 @@ in
       sources."util-deprecate-1.0.2"
       sources."cookie-signature-1.0.6"
       sources."object-assign-4.1.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."moment-timezone-0.5.13"
-      sources."moment-2.18.1"
+      sources."moment-2.19.1"
       sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -31089,6 +32204,7 @@ in
       (sources."finalhandler-1.0.6" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."statuses-1.3.1"
         ];
       })
       sources."fresh-0.5.0"
@@ -31098,7 +32214,11 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.3"
+      (sources."send-0.15.3" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
       sources."serve-static-1.12.3"
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
@@ -31130,7 +32250,7 @@ in
       sources."mqtt-packet-5.4.0"
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
-      sources."split2-2.1.1"
+      sources."split2-2.2.0"
       (sources."websocket-stream-5.0.1" // {
         dependencies = [
           sources."ws-3.2.0"
@@ -31199,7 +32319,7 @@ in
         ];
       })
       sources."streamsearch-0.1.2"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
@@ -31349,7 +32469,7 @@ in
       sources."performance-now-2.1.0"
       sources."uuid-3.1.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -31358,7 +32478,7 @@ in
       (sources."node-pre-gyp-0.6.36" // {
         dependencies = [
           sources."nopt-4.0.1"
-          sources."request-2.82.0"
+          sources."request-2.83.0"
           sources."aws-sign2-0.7.0"
           sources."caseless-0.12.0"
           sources."form-data-2.3.1"
@@ -31379,7 +32499,7 @@ in
         ];
       })
       sources."npmlog-4.1.2"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."rimraf-2.6.2"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
@@ -31469,7 +32589,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-3.0.1" // {
+      (sources."debug-3.1.0" // {
         dependencies = [
           sources."ms-2.0.0"
         ];
@@ -31544,23 +32664,24 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.4.2";
+    version = "5.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz";
-      sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp";
+      url = "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz";
+      sha512 = "3chqlcr8vp121jxny46vi43cm5r0p31l7a24jbbq5jz4zzi0bvp0isk0i8xqylllcas38b75a9nl9p9pj0azbmbqf1bcyf793q8wxik";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."ansi-regex-3.0.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.1.2"
+      sources."aproba-1.2.0"
       sources."archy-1.0.0"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."cacache-9.2.9"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
+      sources."cli-table2-0.2.0"
       sources."cmd-shim-2.0.2"
       (sources."columnify-1.5.4" // {
         dependencies = [
@@ -31583,6 +32704,7 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
       sources."init-package-json-1.10.1"
+      sources."is-cidr-1.0.0"
       sources."lazy-property-1.0.0"
       sources."libnpx-9.6.0"
       sources."lockfile-1.0.3"
@@ -31609,23 +32731,27 @@ in
       sources."npm-install-checks-3.0.0"
       sources."npm-lifecycle-1.0.3"
       sources."npm-package-arg-5.1.2"
-      sources."npm-packlist-1.1.9"
-      sources."npm-registry-client-8.4.0"
+      sources."npm-packlist-1.1.10"
+      sources."npm-profile-2.0.5"
+      sources."npm-registry-client-8.5.0"
       sources."npm-user-validate-1.0.0"
       sources."npmlog-4.1.2"
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
-      sources."pacote-6.0.2"
+      sources."pacote-6.0.4"
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
+      sources."qrcode-terminal-0.11.0"
+      sources."query-string-5.0.0"
+      sources."qw-1.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
       sources."readable-stream-2.3.3"
-      sources."request-2.81.0"
+      sources."request-2.83.0"
       sources."retry-0.10.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
@@ -31643,7 +32769,7 @@ in
       })
       sources."ssri-4.1.6"
       sources."strip-ansi-4.0.0"
-      (sources."tar-4.0.1" // {
+      (sources."tar-4.0.2" // {
         dependencies = [
           sources."yallist-3.0.2"
         ];
@@ -31673,6 +32799,17 @@ in
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."y18n-3.2.1"
+      sources."lodash-3.10.1"
+      (sources."string-width-1.0.2" // {
+        dependencies = [
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."colors-1.1.2"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
@@ -31685,12 +32822,17 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."promzard-0.3.0"
+      sources."cidr-regex-1.0.6"
       sources."dotenv-4.0.0"
-      sources."yargs-8.0.2"
+      (sources."yargs-8.0.2" // {
+        dependencies = [
+          sources."string-width-2.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
       sources."camelcase-4.1.0"
       (sources."cliui-3.2.0" // {
         dependencies = [
-          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
           sources."ansi-regex-2.1.1"
         ];
@@ -31702,23 +32844,14 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."set-blocking-2.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
       sources."which-module-2.0.0"
       sources."yargs-parser-7.0.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
-          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
           sources."ansi-regex-2.1.1"
         ];
       })
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
       sources."execa-0.7.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
@@ -31759,7 +32892,7 @@ in
       sources."parallel-transform-1.1.0"
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
-      sources."stream-each-1.2.0"
+      sources."stream-each-1.2.2"
       sources."through2-2.0.3"
       sources."typedarray-0.0.6"
       sources."stream-shift-1.0.0"
@@ -31772,37 +32905,15 @@ in
       sources."block-stream-0.0.9"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      sources."ignore-walk-3.0.0"
+      sources."ignore-walk-3.0.1"
       sources."npm-bundled-1.0.3"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."delegates-1.0.0"
-      sources."object-assign-4.1.1"
-      (sources."wide-align-1.1.2" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
       sources."make-fetch-happen-2.5.0"
-      sources."npm-pick-manifest-1.0.4"
-      sources."promise-retry-1.1.1"
-      sources."protoduck-4.0.0"
       sources."agentkeepalive-3.3.0"
-      sources."http-cache-semantics-3.7.3"
+      sources."http-cache-semantics-3.8.0"
       sources."http-proxy-agent-2.0.0"
       sources."https-proxy-agent-2.1.0"
       sources."node-fetch-npm-2.0.2"
+      sources."promise-retry-1.1.1"
       sources."socks-proxy-agent-3.0.1"
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
@@ -31813,11 +32924,28 @@ in
       sources."encoding-0.1.12"
       sources."json-parse-better-errors-1.0.1"
       sources."iconv-lite-0.4.19"
+      sources."err-code-1.1.2"
       sources."socks-1.1.10"
       sources."ip-1.1.5"
       sources."smart-buffer-1.1.15"
-      sources."err-code-1.1.2"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."delegates-1.0.0"
+      sources."object-assign-4.1.1"
+      sources."wide-align-1.1.2"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."npm-pick-manifest-1.0.4"
+      sources."protoduck-4.0.0"
       sources."genfun-4.0.1"
+      sources."decode-uri-component-0.2.0"
+      sources."strict-uri-encode-1.1.0"
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."slash-1.0.0"
@@ -31826,66 +32954,52 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
-      sources."hawk-3.1.3"
-      sources."http-signature-1.1.1"
+      sources."form-data-2.3.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.17"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
-      sources."qs-6.4.0"
+      sources."performance-now-2.1.0"
+      sources."qs-6.5.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.3"
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-4.11.8"
-      sources."har-schema-1.0.5"
+      sources."ajv-5.2.4"
+      sources."har-schema-2.0.0"
       sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
-      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.4.1" // {
+      sources."hoek-4.2.0"
+      sources."boom-4.3.1"
+      (sources."cryptiles-3.1.2" // {
         dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
+          sources."boom-5.2.0"
         ];
       })
+      sources."sntp-2.0.2"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
       sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
@@ -31898,11 +33012,13 @@ in
           sources."yallist-3.0.2"
         ];
       })
-      sources."minizlib-1.0.3"
+      sources."minizlib-1.0.4"
       sources."unique-slug-2.0.0"
-      (sources."boxen-1.2.1" // {
+      (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
+          sources."string-width-2.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
         ];
       })
       (sources."chalk-1.1.3" // {
@@ -31919,19 +33035,18 @@ in
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      sources."ansi-align-2.0.0"
-      sources."cli-boxes-1.0.0"
-      sources."term-size-1.2.0"
-      (sources."widest-line-1.0.0" // {
+      (sources."ansi-align-2.0.0" // {
         dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."ansi-regex-2.1.1"
+          sources."string-width-2.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
         ];
       })
+      sources."cli-boxes-1.0.0"
+      sources."term-size-1.2.0"
+      sources."widest-line-1.0.0"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
+      sources."supports-color-4.5.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -31941,7 +33056,11 @@ in
         ];
       })
       sources."dot-prop-4.2.0"
-      sources."make-dir-1.0.0"
+      (sources."make-dir-1.1.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
       sources."crypto-random-string-1.0.0"
@@ -31959,7 +33078,7 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -32022,7 +33141,7 @@ in
       sources."coffee-script-1.12.7"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."graceful-fs-2.0.3"
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
@@ -32055,7 +33174,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -32127,7 +33246,7 @@ in
       sources."nopt-2.2.1"
       sources."ini-1.1.0"
       sources."proto-list-1.2.4"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."block-stream-0.0.9"
       (sources."fstream-0.1.31" // {
         dependencies = [
@@ -32157,13 +33276,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.12.1";
+    version = "2.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz";
-      sha512 = "2p62mjf7a9bjycq3x1jbp3vsvn8ww3ccrfx96syp7p19bzgg58q80didz4ygwn8cf1xxiyqhr3v3mwi7v9v90gnb8lsas4yz62z55ac";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz";
+      sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2";
     };
     dependencies = [
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
@@ -32184,10 +33303,9 @@ in
           sources."semver-4.3.6"
         ];
       })
-      sources."require-dir-0.3.2"
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.41.1" // {
+      (sources."snyk-1.45.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -32199,23 +33317,20 @@ in
         ];
       })
       sources."spawn-please-0.3.0"
-      (sources."update-notifier-2.2.0" // {
+      (sources."update-notifier-2.3.0" // {
         dependencies = [
-          (sources."boxen-1.2.1" // {
-            dependencies = [
-              sources."chalk-2.1.0"
-            ];
-          })
+          sources."boxen-1.2.2"
+          sources."chalk-2.2.0"
           sources."configstore-3.1.1"
           sources."latest-version-3.1.0"
           sources."xdg-basedir-3.0.0"
           sources."camelcase-4.1.0"
           sources."string-width-2.1.1"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
           sources."dot-prop-4.2.0"
           sources."write-file-atomic-2.3.0"
           sources."package-json-4.0.1"
@@ -32373,8 +33488,8 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.30"
-      sources."es6-iterator-2.0.1"
+      sources."es5-ext-0.10.35"
+      sources."es6-iterator-2.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
@@ -32492,12 +33607,12 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-go-plugin-1.2.1"
-      sources."snyk-gradle-plugin-1.1.2"
+      sources."snyk-go-plugin-1.3.7"
+      sources."snyk-gradle-plugin-1.2.0"
       sources."snyk-module-1.8.1"
-      sources."snyk-mvn-plugin-1.0.3"
+      sources."snyk-mvn-plugin-1.1.0"
       sources."snyk-policy-1.7.1"
-      sources."snyk-python-plugin-1.2.4"
+      sources."snyk-python-plugin-1.4.0"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -32509,7 +33624,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."snyk-sbt-plugin-1.1.1"
+      sources."snyk-sbt-plugin-1.2.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.2.0"
       (sources."tempfile-1.1.1" // {
@@ -32563,6 +33678,7 @@ in
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
+      sources."graphlib-2.1.1"
       sources."toml-2.3.3"
       sources."clone-deep-0.3.0"
       sources."for-own-1.0.0"
@@ -32629,7 +33745,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -32669,6 +33785,7 @@ in
       sources."stream-shift-1.0.0"
       sources."querystring-0.2.0"
       sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       (sources."ansi-align-2.0.0" // {
         dependencies = [
           sources."string-width-2.1.1"
@@ -32679,9 +33796,6 @@ in
       })
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -32691,9 +33805,18 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."path-key-2.0.1"
-      sources."make-dir-1.0.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      (sources."make-dir-1.1.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."unique-string-1.0.0"
       sources."crypto-random-string-1.0.0"
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
       sources."duplexer3-0.1.4"
     ];
     buildInputs = globalBuildInputs;
@@ -32707,21 +33830,21 @@ in
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
     packageName = "ocaml-language-server";
-    version = "1.0.0";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.0.tgz";
-      sha512 = "32glgr9c42bz2yp3k7kff9skkvrm1zrvcvv2pkifjmzbl3kca3bmapgz598jdm64hi3y0jbby4s90bv8838q40ni5lfh35863c57i0n";
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.1.tgz";
+      sha512 = "05wpkgddw5r99fm8082l7sm48yd4xi2892w95fbsqhvy81xas0v2z8k9c7s09m7bvw3hn8rhl7c7cdwf4xafzphwax8zx5w22prpp15";
     };
     dependencies = [
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."glob-7.1.2"
       sources."lodash-4.17.4"
-      sources."lokijs-1.4.3"
+      sources."lokijs-1.5.0"
       sources."pegjs-0.10.0"
-      sources."vscode-jsonrpc-3.2.0"
-      sources."vscode-languageclient-3.2.2"
-      sources."vscode-languageserver-3.2.2"
-      sources."vscode-languageserver-types-3.2.0"
+      sources."vscode-jsonrpc-3.4.1"
+      sources."vscode-languageclient-3.4.5"
+      sources."vscode-languageserver-3.4.3"
+      sources."vscode-languageserver-types-3.4.0"
       sources."vscode-uri-1.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -32733,6 +33856,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
+      sources."vscode-languageserver-protocol-3.4.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32758,34 +33882,26 @@ in
           sources."content-type-1.0.4"
         ];
       })
-      (sources."compression-1.7.0" // {
-        dependencies = [
-          sources."bytes-2.5.0"
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."compression-1.7.1"
       sources."connect-busboy-0.0.2"
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
       sources."core-js-2.5.1"
       sources."diff-1.4.0"
       sources."domino-1.0.29"
       sources."entities-1.1.1"
-      (sources."express-4.15.4" // {
+      (sources."express-4.16.2" // {
         dependencies = [
           sources."content-type-1.0.4"
-          sources."debug-2.6.8"
-          (sources."finalhandler-1.0.6" // {
-            dependencies = [
-              sources."debug-2.6.9"
-            ];
-          })
-          sources."qs-6.5.0"
+          sources."finalhandler-1.1.0"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.3.1"
         ];
       })
       sources."express-handlebars-3.0.0"
       (sources."finalhandler-0.5.1" // {
         dependencies = [
           sources."debug-2.2.0"
+          sources."statuses-1.3.1"
           sources."ms-0.7.1"
         ];
       })
@@ -32795,13 +33911,9 @@ in
       sources."node-uuid-1.4.8"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
       sources."prfun-2.1.4"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."semver-5.4.1"
-      (sources."serve-favicon-2.4.4" // {
-        dependencies = [
-          sources."fresh-0.5.1"
-        ];
-      })
+      sources."serve-favicon-2.4.5"
       (sources."service-runner-2.3.0" // {
         dependencies = [
           sources."yargs-7.1.0"
@@ -32832,17 +33944,17 @@ in
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
       sources."mime-types-2.1.17"
       sources."mime-db-1.30.0"
       sources."accepts-1.3.4"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."busboy-0.2.14"
       sources."dicer-0.2.5"
       sources."readable-stream-1.1.14"
@@ -32857,27 +33969,27 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."fresh-0.5.0"
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.5"
+      sources."proxy-addr-2.0.2"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.16.1" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."statuses-1.3.1"
         ];
       })
-      sources."serve-static-1.12.4"
-      sources."utils-merge-1.0.0"
+      sources."serve-static-1.13.1"
+      sources."utils-merge-1.0.1"
       sources."forwarded-0.1.2"
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."destroy-1.0.4"
-      sources."mime-1.3.4"
+      sources."mime-1.4.1"
       sources."glob-6.0.4"
       sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.10" // {
+      (sources."handlebars-4.0.11" // {
         dependencies = [
           sources."async-1.5.2"
         ];
@@ -32948,7 +34060,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -32977,7 +34089,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."bunyan-1.8.12"
       sources."bunyan-syslog-udp-0.1.0"
       sources."gelf-stream-1.1.1"
@@ -32993,7 +34105,7 @@ in
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
-      sources."moment-2.18.1"
+      sources."moment-2.19.1"
       sources."nan-2.7.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -33117,7 +34229,7 @@ in
         ];
       })
       sources."keypress-0.2.1"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."network-address-1.1.2"
       sources."numeral-1.5.6"
       sources."open-0.0.5"
@@ -33133,7 +34245,7 @@ in
       })
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -33365,7 +34477,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.5.2"
+      sources."ipaddr.js-1.5.4"
       sources."get-browser-rtc-1.0.2"
       sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
@@ -33388,7 +34500,7 @@ in
       sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87";
     };
     dependencies = [
-      sources."connect-multiparty-2.0.0"
+      sources."connect-multiparty-2.1.0"
       (sources."express-3.21.2" // {
         dependencies = [
           sources."range-parser-1.0.3"
@@ -33415,7 +34527,7 @@ in
       sources."fluent-ffmpeg-2.1.2"
       sources."multiparty-4.1.3"
       sources."on-finished-2.3.0"
-      sources."qs-4.0.0"
+      sources."qs-6.5.1"
       sources."type-is-1.6.15"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
@@ -33427,6 +34539,7 @@ in
       (sources."connect-2.30.2" // {
         dependencies = [
           sources."multiparty-3.3.2"
+          sources."qs-4.0.0"
         ];
       })
       sources."content-disposition-0.5.0"
@@ -33453,7 +34566,11 @@ in
       sources."utils-merge-1.0.0"
       sources."vary-1.0.1"
       sources."basic-auth-connect-1.0.0"
-      sources."body-parser-1.13.3"
+      (sources."body-parser-1.13.3" // {
+        dependencies = [
+          sources."qs-4.0.0"
+        ];
+      })
       sources."bytes-2.1.0"
       sources."cookie-parser-1.3.5"
       sources."compression-1.5.2"
@@ -33473,10 +34590,10 @@ in
       })
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.9" // {
+      (sources."method-override-2.3.10" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."vary-1.1.1"
+          sources."debug-2.6.9"
+          sources."vary-1.1.2"
           sources."ms-2.0.0"
         ];
       })
@@ -33517,7 +34634,7 @@ in
       })
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."negotiator-0.5.3"
       sources."ms-0.7.1"
       sources."csrf-3.0.6"
@@ -33528,7 +34645,7 @@ in
       sources."crc-3.3.0"
       sources."base64-url-1.2.1"
       sources."inherits-2.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."readable-stream-1.1.14"
       sources."stream-counter-0.2.0"
       sources."core-util-is-1.0.2"
@@ -33884,10 +35001,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.7.0";
+    version = "1.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz";
-      sha512 = "1ib30g1a6lq7pn1ajpmvajs3y4q94yb0xz53zp1s6gbbmihfn1zr8imp8vydlmh1cj41s2ymdkddq8hfq7mlr9caji83c9x87fw11lh";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.7.4.tgz";
+      sha1 = "5e8624ae9363c80f95ec644584ecdf55d74f93fa";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -34040,7 +35157,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
-      sources."browserify-aes-1.0.8"
+      sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."buffer-xor-1.0.3"
@@ -34064,8 +35181,8 @@ in
           sources."hash-base-2.0.2"
         ];
       })
-      sources."sha.js-2.4.8"
-      sources."miller-rabin-4.0.0"
+      sources."sha.js-2.4.9"
+      sources."miller-rabin-4.0.1"
       sources."function-bind-1.1.1"
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
@@ -34103,7 +35220,7 @@ in
         ];
       })
       sources."colors-1.1.2"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."mute-stream-0.0.7"
       sources."os-tmpdir-1.0.2"
       sources."rimraf-2.2.8"
@@ -34172,7 +35289,7 @@ in
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."request-2.81.0"
       sources."hawk-3.1.3"
       sources."semver-5.4.1"
@@ -34182,7 +35299,7 @@ in
           sources."rimraf-2.6.2"
         ];
       })
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."are-we-there-yet-1.1.4"
@@ -34308,8 +35425,8 @@ in
       sources."graceful-fs-4.1.11"
       sources."iconv-lite-0.4.19"
       sources."mkdirp-0.5.1"
-      sources."private-0.1.7"
-      sources."q-1.5.0"
+      sources."private-0.1.8"
+      sources."q-1.5.1"
       sources."recast-0.11.23"
       sources."acorn-4.0.13"
       sources."defined-1.0.0"
@@ -34388,7 +35505,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-3.0.1"
+      sources."debug-3.1.0"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -34409,7 +35526,7 @@ in
       sources."request-2.9.203"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."request-2.82.0"
+          sources."request-2.83.0"
           sources."qs-6.5.1"
         ];
       })
@@ -34440,7 +35557,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -34496,19 +35613,15 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.1.0";
+    version = "6.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.1.0.tgz";
-      sha512 = "3hrp79lvglwci8nbyxqwy38f27xfa2axsb5nzqy6hsg4sjs1fpn0va22zv01jgdxjqs9lhpisc47y5aidd699mnrxpvp787gsgvx8ic";
+      url = "https://registry.npmjs.org/serve/-/serve-6.3.1.tgz";
+      sha512 = "3zimikqfpvw7vhrp8qaf1pk3wk9idqpa72jvla68f9skcyrl9027ksgb851y251fzxmklxzymipy42gf9m7vnp8jjvya4gwng7mmr6n";
     };
     dependencies = [
-      (sources."args-3.0.4" // {
-        dependencies = [
-          sources."chalk-2.0.1"
-        ];
-      })
+      sources."args-3.0.7"
       sources."basic-auth-2.0.0"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."boxen-1.2.1"
       sources."chalk-2.1.0"
       (sources."clipboardy-1.1.4" // {
@@ -34526,32 +35639,19 @@ in
       sources."micro-compress-1.0.0"
       sources."mime-types-2.1.17"
       sources."node-version-1.1.0"
+      sources."openssl-self-signed-certificate-1.1.6"
       sources."opn-5.1.0"
       sources."path-type-3.0.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.16.1" // {
         dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
-      (sources."update-notifier-2.2.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."ansi-styles-2.2.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."ansi-regex-2.1.1"
+          sources."statuses-1.3.1"
         ];
       })
+      sources."update-notifier-2.3.0"
       sources."camelcase-4.1.0"
-      sources."minimist-1.2.0"
-      sources."pkginfo-0.4.0"
+      sources."mri-1.1.0"
+      sources."pkginfo-0.4.1"
       sources."string-similarity-1.2.0"
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."lodash-4.17.4"
       sources."safe-buffer-5.1.1"
       sources."ansi-align-2.0.0"
@@ -34587,6 +35687,12 @@ in
       sources."path-key-2.0.1"
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
+      sources."ansi-styles-3.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.5.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."address-1.0.3"
       sources."debug-2.6.9"
       sources."ms-2.0.0"
@@ -34594,11 +35700,7 @@ in
       sources."jsonfile-4.0.0"
       sources."universalify-0.1.1"
       sources."async-1.5.2"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
+      sources."optimist-0.6.1"
       sources."source-map-0.4.4"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
@@ -34606,6 +35708,7 @@ in
         ];
       })
       sources."wordwrap-0.0.3"
+      sources."minimist-0.0.10"
       sources."amdefine-1.0.1"
       (sources."yargs-3.10.0" // {
         dependencies = [
@@ -34629,7 +35732,6 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."media-typer-0.3.0"
-      sources."mri-1.1.0"
       sources."raw-body-2.3.2"
       sources."bytes-3.0.0"
       sources."http-errors-1.6.2"
@@ -34638,17 +35740,12 @@ in
       sources."depd-1.1.1"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
-      (sources."compression-1.7.0" // {
-        dependencies = [
-          sources."bytes-2.5.0"
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."statuses-1.4.0"
+      sources."compression-1.7.1"
       sources."accepts-1.3.4"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."mime-db-1.30.0"
       sources."is-wsl-1.1.0"
@@ -34657,33 +35754,29 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."fresh-0.5.0"
-      sources."mime-1.3.4"
+      sources."fresh-0.5.2"
+      sources."mime-1.4.1"
       sources."on-finished-2.3.0"
       sources."range-parser-1.2.0"
       sources."ee-first-1.1.1"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
       sources."dot-prop-4.2.0"
-      (sources."make-dir-1.0.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."write-file-atomic-2.3.0"
       sources."is-obj-1.0.1"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
+      sources."ini-1.3.4"
+      sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
@@ -34699,9 +35792,12 @@ in
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
-      sources."rc-1.2.1"
+      (sources."rc-1.2.2" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."deep-extend-0.4.2"
-      sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -34721,29 +35817,25 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      sources."express-5.0.0-alpha.5"
+      sources."express-5.0.0-alpha.6"
       sources."express-json5-0.1.0"
       (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."bytes-3.0.0"
-          sources."debug-2.6.9"
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
           sources."raw-body-2.3.2"
-          sources."ms-2.0.0"
         ];
       })
-      (sources."compression-1.7.0" // {
+      (sources."compression-1.7.1" // {
         dependencies = [
-          sources."bytes-2.5.0"
-          sources."debug-2.6.8"
-          sources."ms-2.0.0"
+          sources."bytes-3.0.0"
         ];
       })
       sources."commander-2.11.0"
       sources."js-yaml-3.10.0"
       sources."cookies-0.7.1"
-      (sources."request-2.82.0" // {
+      (sources."request-2.83.0" // {
         dependencies = [
           sources."qs-6.5.1"
         ];
@@ -34776,18 +35868,13 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."debug-2.6.1"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."finalhandler-1.0.6" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."fresh-0.5.0"
+      sources."finalhandler-1.0.6"
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
@@ -34795,25 +35882,25 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
-      sources."qs-6.4.0"
+      sources."qs-6.5.0"
       sources."range-parser-1.2.0"
-      (sources."router-1.3.1" // {
+      (sources."router-1.3.2" // {
         dependencies = [
-          sources."debug-2.6.8"
-          sources."ms-2.0.0"
+          sources."setprototypeof-1.1.0"
+          sources."utils-merge-1.0.1"
         ];
       })
-      sources."send-0.15.1"
-      sources."serve-static-1.12.1"
+      sources."send-0.15.6"
+      sources."serve-static-1.12.6"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."mime-types-2.1.17"
       sources."negotiator-0.6.1"
       sources."mime-db-1.30.0"
-      sources."ms-0.7.2"
+      sources."ms-2.0.0"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.2"
@@ -34824,7 +35911,7 @@ in
       sources."raw-body-1.3.4"
       sources."bytes-1.0.0"
       sources."iconv-lite-0.4.8"
-      sources."compressible-2.0.11"
+      sources."compressible-2.0.12"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."argparse-1.0.9"
@@ -34852,7 +35939,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -34887,7 +35974,7 @@ in
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
-      sources."moment-2.18.1"
+      sources."moment-2.19.1"
       sources."nan-2.7.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -35048,14 +36135,14 @@ in
           sources."extsprintf-1.0.0"
         ];
       })
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."backoff-2.5.0"
       sources."csv-0.4.6"
       sources."escape-regexp-component-1.0.2"
       sources."formidable-1.1.1"
       sources."http-signature-0.11.0"
       sources."keep-alive-agent-0.0.1"
-      sources."mime-1.4.0"
+      sources."mime-1.4.1"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
       sources."once-1.4.0"
@@ -35071,7 +36158,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.2.3"
+      sources."csv-parse-1.3.3"
       sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -35142,7 +36229,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-3.0.1"
+      sources."debug-3.1.0"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -35184,7 +36271,7 @@ in
       sources."whet.extend-0.9.9"
       sources."mkdirp-0.5.1"
       sources."csso-2.3.2"
-      sources."q-1.5.0"
+      sources."q-1.5.1"
       sources."argparse-1.0.9"
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
@@ -35255,10 +36342,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.5.2";
+    version = "2.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz";
-      sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz";
+      sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35278,7 +36365,7 @@ in
     };
     dependencies = [
       sources."archy-1.0.0"
-      sources."bluebird-3.5.0"
+      sources."bluebird-3.5.1"
       sources."chalk-1.1.3"
       sources."cli-truncate-1.1.0"
       sources."columnify-1.5.4"
@@ -35289,7 +36376,13 @@ in
       sources."minimist-1.2.0"
       sources."promise-finally-3.0.0"
       sources."typings-core-2.3.3"
-      sources."update-notifier-2.2.0"
+      (sources."update-notifier-2.3.0" // {
+        dependencies = [
+          sources."chalk-2.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
+        ];
+      })
       sources."wordwrap-1.0.0"
       sources."xtend-4.0.1"
       sources."ansi-styles-2.2.1"
@@ -35337,7 +36430,7 @@ in
       sources."popsicle-retry-3.2.1"
       sources."popsicle-rewrite-1.0.0"
       sources."popsicle-status-2.0.1"
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."rimraf-2.6.2"
       sources."sort-keys-1.1.2"
       sources."string-template-1.0.0"
@@ -35345,15 +36438,15 @@ in
       sources."thenify-3.3.0"
       sources."throat-3.2.0"
       sources."touch-1.0.0"
-      sources."typescript-2.5.2"
+      sources."typescript-2.5.3"
       sources."zip-object-0.1.0"
       sources."dot-prop-4.2.0"
-      sources."make-dir-1.0.0"
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."signal-exit-3.0.2"
@@ -35408,15 +36501,16 @@ in
       sources."concat-map-0.0.1"
       sources."is-plain-obj-1.1.0"
       sources."nopt-1.0.10"
-      sources."abbrev-1.1.0"
-      (sources."boxen-1.2.1" // {
+      sources."abbrev-1.1.1"
+      (sources."boxen-1.2.2" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
         ];
       })
       sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
@@ -35450,6 +36544,9 @@ in
       sources."path-key-2.0.1"
       sources."code-point-at-1.1.0"
       sources."number-is-nan-1.0.1"
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
+      sources."path-is-inside-1.0.2"
       (sources."package-json-4.0.1" // {
         dependencies = [
           sources."semver-5.4.1"
@@ -35480,14 +36577,14 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.1.1";
+    version = "3.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz";
-      sha512 = "324ss2wqxsz86ih8hy14lkaqaq32kck3mkka79nj7v3bk9288c9a1x7pc88na5g17ch83qvg9j5hwlzl7v72crl5c01dz9d92cfkc3z";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz";
+      sha512 = "1fgrmz71wwy21h9m0vg1f0hd9g4c5gdj1xa87cfcl920plwpv90ps0kkafs6xhgbvxl2a9bqmjz8k6sdp96x9hf9cap0r66pwxsaamm";
     };
     dependencies = [
       sources."commander-2.11.0"
-      sources."source-map-0.5.7"
+      sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -35500,36 +36597,35 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.29";
+    version = "1.1.33";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.29.tgz";
-      sha1 = "4376943f1924f90f294f5f17ae56bda852cb1643";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.33.tgz";
+      sha1 = "f5b42a9e36e6d236060df399ece5bd14066cf716";
     };
     dependencies = [
       sources."async-2.5.0"
-      sources."bluebird-3.5.0"
-      sources."blueimp-md5-2.8.0"
-      sources."body-parser-1.17.2"
+      sources."bluebird-3.5.1"
+      sources."blueimp-md5-2.10.0"
+      sources."body-parser-1.18.2"
       sources."color-2.0.0"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-2.3.0"
-      (sources."express-4.15.4" // {
+      sources."diff2html-2.3.2"
+      (sources."express-4.15.5" // {
         dependencies = [
-          sources."debug-2.6.8"
           sources."qs-6.5.0"
-          sources."serve-static-1.12.4"
+          sources."statuses-1.3.1"
         ];
       })
-      (sources."express-session-1.15.5" // {
+      (sources."express-session-1.15.6" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."utils-merge-1.0.1"
         ];
       })
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.3.5"
+      sources."ignore-3.3.6"
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
@@ -35550,20 +36646,14 @@ in
       })
       sources."moment-2.18.1"
       sources."node-cache-4.1.1"
-      (sources."npm-4.6.1" // {
+      (sources."npm-5.4.2" // {
         dependencies = [
+          sources."lru-cache-4.1.1"
           sources."nopt-4.0.1"
-          sources."npm-registry-client-8.1.1"
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."request-2.81.0"
-          sources."semver-5.3.0"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          (sources."string_decoder-1.0.3" // {
-            dependencies = [
-              sources."safe-buffer-5.1.1"
-            ];
-          })
+          sources."string_decoder-1.0.3"
           sources."combined-stream-1.0.5"
           sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
@@ -35571,6 +36661,7 @@ in
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
+          sources."qs-6.4.0"
           sources."tunnel-agent-0.6.0"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -35581,7 +36672,7 @@ in
       })
       (sources."npm-registry-client-8.4.0" // {
         dependencies = [
-          sources."request-2.82.0"
+          sources."request-2.83.0"
           sources."aws-sign2-0.7.0"
           sources."combined-stream-1.0.5"
           sources."extend-3.0.1"
@@ -35593,11 +36684,9 @@ in
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
           sources."performance-now-2.1.0"
-          sources."qs-6.5.1"
           sources."tunnel-agent-0.6.0"
-          sources."uuid-3.1.0"
           sources."delayed-stream-1.0.0"
-          sources."ajv-5.2.2"
+          sources."ajv-5.2.4"
           sources."har-schema-2.0.0"
           sources."hoek-4.2.0"
           sources."boom-4.3.1"
@@ -35622,23 +36711,17 @@ in
           sources."uuid-3.0.0"
         ];
       })
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."rimraf-2.6.2"
       sources."semver-5.4.1"
-      (sources."serve-static-1.12.6" // {
-        dependencies = [
-          sources."send-0.15.6"
-          sources."debug-2.6.9"
-          sources."fresh-0.5.2"
-        ];
-      })
+      sources."serve-static-1.12.6"
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
-      sources."socket.io-2.0.3"
+      sources."socket.io-2.0.4"
       (sources."superagent-3.5.2" // {
         dependencies = [
           sources."component-emitter-1.2.1"
@@ -35664,28 +36747,21 @@ in
           sources."colors-1.0.3"
         ];
       })
-      (sources."yargs-8.0.2" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      sources."bytes-2.4.0"
+      sources."yargs-9.0.1"
+      sources."bytes-3.0.0"
       sources."content-type-1.0.4"
-      sources."debug-2.6.7"
+      sources."debug-2.6.9"
       sources."depd-1.1.1"
       sources."http-errors-1.6.2"
-      sources."iconv-lite-0.4.15"
+      sources."iconv-lite-0.4.19"
       sources."on-finished-2.3.0"
-      sources."qs-6.4.0"
-      sources."raw-body-2.2.0"
+      sources."qs-6.5.1"
+      sources."raw-body-2.3.2"
       sources."type-is-1.6.15"
       sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
@@ -35698,7 +36774,7 @@ in
       sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."diff-3.3.1"
+      sources."diff-3.4.0"
       (sources."hogan.js-3.0.2" // {
         dependencies = [
           sources."mkdirp-0.3.0"
@@ -35706,7 +36782,7 @@ in
       })
       sources."whatwg-fetch-2.0.3"
       sources."nopt-1.0.10"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -35715,23 +36791,23 @@ in
       sources."etag-1.8.1"
       (sources."finalhandler-1.0.6" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."statuses-1.3.1"
         ];
       })
-      sources."fresh-0.5.0"
+      sources."fresh-0.5.2"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.4" // {
+      (sources."send-0.15.6" // {
         dependencies = [
-          sources."debug-2.6.8"
+          sources."statuses-1.3.1"
         ];
       })
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.1"
+      sources."vary-1.1.2"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.2"
       sources."ipaddr.js-1.4.0"
@@ -35806,7 +36882,7 @@ in
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
       sources."deep-equal-1.0.1"
-      sources."i-0.3.5"
+      sources."i-0.3.6"
       sources."ncp-0.4.2"
       sources."lru-cache-1.0.6"
       (sources."event-stream-0.5.3" // {
@@ -35830,17 +36906,27 @@ in
       sources."string_decoder-0.10.31"
       sources."clone-2.1.1"
       sources."JSONStream-1.3.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-3.0.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
-      sources."asap-2.0.6"
+      (sources."cacache-9.2.9" // {
+        dependencies = [
+          sources."lru-cache-4.1.1"
+        ];
+      })
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
-      sources."columnify-1.5.4"
+      (sources."columnify-1.5.4" // {
+        dependencies = [
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."config-chain-1.1.11"
+      sources."detect-indent-5.0.0"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.10"
@@ -35851,8 +36937,6 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      sources."fstream-1.0.11"
-      sources."fstream-npm-1.2.1"
       (sources."glob-7.1.2" // {
         dependencies = [
           sources."minimatch-3.0.4"
@@ -35860,17 +36944,23 @@ in
       })
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
+      (sources."libnpx-9.6.0" // {
+        dependencies = [
+          sources."yargs-8.0.2"
+        ];
+      })
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
+      sources."meant-1.0.1"
       sources."mississippi-1.3.0"
       sources."move-concurrently-1.0.1"
       (sources."node-gyp-3.6.2" // {
@@ -35878,26 +36968,35 @@ in
           sources."minimatch-3.0.4"
           sources."nopt-3.0.6"
           sources."semver-5.3.0"
+          sources."tar-2.2.1"
         ];
       })
-      sources."normalize-git-url-3.0.2"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.1"
-      sources."npm-user-validate-0.1.5"
-      sources."npmlog-4.0.2"
+      sources."npm-lifecycle-1.0.3"
+      sources."npm-package-arg-5.1.2"
+      sources."npm-packlist-1.1.10"
+      sources."npm-user-validate-1.0.0"
+      sources."npmlog-4.1.2"
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
+      (sources."pacote-6.0.4" // {
+        dependencies = [
+          sources."lru-cache-4.1.1"
+          sources."minimatch-3.0.4"
+        ];
+      })
       sources."path-is-inside-1.0.2"
+      sources."promise-inflight-1.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
-      sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
+      sources."safe-buffer-5.1.1"
       (sources."sha-2.0.1" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -35913,18 +37012,24 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
-      sources."strip-ansi-3.0.1"
-      sources."tar-2.2.1"
+      sources."ssri-4.1.6"
+      sources."strip-ansi-4.0.0"
+      (sources."tar-4.0.2" // {
+        dependencies = [
+          sources."yallist-3.0.2"
+        ];
+      })
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
-      sources."update-notifier-2.1.0"
-      sources."uuid-3.0.1"
+      sources."update-notifier-2.2.0"
+      sources."uuid-3.1.0"
       sources."validate-npm-package-name-3.0.0"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
+      sources."worker-farm-1.5.0"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
+      sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -35937,6 +37042,9 @@ in
       sources."validate-npm-package-license-3.0.1"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
+      sources."y18n-3.2.1"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
       sources."wcwidth-1.0.1"
       (sources."defaults-1.0.3" // {
         dependencies = [
@@ -35944,20 +37052,83 @@ in
         ];
       })
       sources."proto-list-1.2.4"
+      sources."asap-2.0.6"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.1"
       sources."util-deprecate-1.0.2"
-      (sources."fstream-ignore-1.0.5" // {
-        dependencies = [
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."fs.realpath-1.0.0"
+      sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."path-is-absolute-1.0.1"
       sources."promzard-0.3.0"
+      sources."dotenv-4.0.0"
+      sources."camelcase-4.1.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."read-pkg-up-2.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."which-module-2.0.0"
+      sources."yargs-parser-7.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."execa-0.7.0"
+      sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      (sources."cross-spawn-5.1.0" // {
+        dependencies = [
+          sources."lru-cache-4.1.1"
+        ];
+      })
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."path-key-2.0.1"
+      sources."invert-kv-1.0.0"
+      sources."mimic-fn-1.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
+      sources."load-json-file-2.0.0"
+      sources."path-type-2.0.0"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-3.0.0"
+      (sources."error-ex-1.3.1" // {
+        dependencies = [
+          sources."is-arrayish-0.2.1"
+        ];
+      })
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       (sources."concat-stream-1.6.0" // {
@@ -35998,7 +37169,7 @@ in
       })
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
-      sources."stream-each-1.2.0"
+      sources."stream-each-1.2.2"
       (sources."through2-2.0.3" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -36012,8 +37183,16 @@ in
       sources."xtend-4.0.1"
       sources."copy-concurrently-1.0.5"
       sources."run-queue-1.0.3"
+      sources."fstream-1.0.11"
+      sources."block-stream-0.0.9"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
+      (sources."ignore-walk-3.0.1" // {
+        dependencies = [
+          sources."minimatch-3.0.4"
+        ];
+      })
+      sources."npm-bundled-1.0.3"
       (sources."are-we-there-yet-1.1.4" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -36022,20 +37201,50 @@ in
         ];
       })
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."delegates-1.0.0"
       sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
+      (sources."wide-align-1.1.2" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."os-tmpdir-1.0.2"
+      (sources."make-fetch-happen-2.5.0" // {
+        dependencies = [
+          sources."lru-cache-4.1.1"
+        ];
+      })
+      sources."npm-pick-manifest-1.0.4"
+      sources."promise-retry-1.1.1"
+      sources."protoduck-4.0.0"
+      sources."agentkeepalive-3.3.0"
+      sources."http-cache-semantics-3.8.0"
+      sources."http-proxy-agent-2.0.0"
+      sources."https-proxy-agent-2.1.0"
+      sources."node-fetch-npm-2.0.2"
+      sources."socks-proxy-agent-3.0.1"
+      sources."humanize-ms-1.2.1"
+      sources."agent-base-4.1.1"
+      sources."es6-promisify-5.0.0"
+      sources."es6-promise-4.1.1"
+      sources."encoding-0.1.12"
+      sources."json-parse-better-errors-1.0.1"
+      sources."socks-1.1.10"
+      sources."ip-1.1.5"
+      sources."smart-buffer-1.1.15"
+      sources."err-code-1.1.2"
+      sources."genfun-4.0.1"
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
-      sources."json-parse-better-errors-1.0.1"
       sources."slash-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -36094,71 +37303,59 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      sources."block-stream-0.0.9"
-      sources."unique-slug-2.0.0"
-      (sources."boxen-1.2.1" // {
+      (sources."minipass-2.2.1" // {
         dependencies = [
-          sources."chalk-2.1.0"
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
+          sources."yallist-3.0.2"
+        ];
+      })
+      sources."minizlib-1.0.4"
+      sources."unique-slug-2.0.0"
+      (sources."boxen-1.2.2" // {
+        dependencies = [
+          sources."chalk-2.2.0"
         ];
       })
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."ansi-styles-2.2.1"
+          sources."strip-ansi-3.0.1"
           sources."supports-color-2.0.0"
+          sources."ansi-regex-2.1.1"
         ];
       })
-      (sources."configstore-3.1.1" // {
-        dependencies = [
-          sources."write-file-atomic-2.3.0"
-        ];
-      })
+      sources."configstore-3.1.1"
+      sources."import-lazy-2.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
-      sources."lazy-req-2.0.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      (sources."ansi-align-2.0.0" // {
-        dependencies = [
-          sources."string-width-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
-      sources."camelcase-4.1.0"
+      sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
-      sources."ansi-styles-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.4.0"
-      sources."has-flag-2.0.0"
-      sources."execa-0.7.0"
-      (sources."cross-spawn-5.1.0" // {
+      (sources."widest-line-1.0.0" // {
         dependencies = [
-          sources."lru-cache-4.1.1"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."ansi-styles-3.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.5.0"
+      sources."has-flag-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
         ];
       })
-      sources."get-stream-3.0.0"
-      sources."is-stream-1.1.0"
-      sources."npm-run-path-2.0.2"
-      sources."p-finally-1.0.0"
-      sources."strip-eof-1.0.0"
-      sources."shebang-command-1.2.0"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.1.2"
-      sources."shebang-regex-1.0.0"
-      sources."path-key-2.0.1"
-      sources."has-ansi-2.0.0"
       sources."dot-prop-4.2.0"
-      sources."make-dir-1.0.0"
+      (sources."make-dir-1.1.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
@@ -36176,10 +37373,11 @@ in
       sources."prepend-http-1.0.4"
       sources."builtins-1.0.3"
       sources."isexe-2.0.0"
+      sources."errno-0.1.4"
+      sources."prr-0.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."ssri-4.1.6"
       sources."fast-deep-equal-1.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."passport-strategy-1.0.0"
@@ -36188,13 +37386,13 @@ in
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."eve-0.5.4"
-      (sources."engine.io-3.1.1" // {
+      (sources."engine.io-3.1.3" // {
         dependencies = [
           sources."accepts-1.3.3"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.0.3" // {
+      (sources."socket.io-client-2.0.4" // {
         dependencies = [
           sources."component-emitter-1.2.1"
         ];
@@ -36225,7 +37423,7 @@ in
       sources."ultron-1.1.0"
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
-      (sources."engine.io-client-3.1.1" // {
+      (sources."engine.io-client-3.1.3" // {
         dependencies = [
           sources."component-emitter-1.2.1"
         ];
@@ -36237,47 +37435,16 @@ in
       sources."parseuri-0.0.5"
       sources."to-array-0.1.4"
       sources."component-inherit-0.0.3"
-      sources."parsejson-0.0.3"
-      sources."xmlhttprequest-ssl-1.5.3"
+      sources."xmlhttprequest-ssl-1.5.4"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
-      sources."cliui-3.2.0"
-      sources."decamelize-1.2.0"
-      sources."get-caller-file-1.0.2"
-      sources."os-locale-2.1.0"
-      sources."read-pkg-up-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."which-module-2.0.0"
-      sources."y18n-3.2.1"
-      sources."yargs-parser-7.0.0"
-      sources."wrap-ansi-2.1.0"
-      sources."lcid-1.0.0"
-      sources."mem-1.1.0"
-      sources."invert-kv-1.0.0"
-      sources."mimic-fn-1.1.0"
-      sources."find-up-2.1.0"
-      sources."read-pkg-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."p-locate-2.0.0"
-      sources."path-exists-3.0.0"
-      sources."p-limit-1.1.0"
-      sources."load-json-file-2.0.0"
-      sources."path-type-2.0.0"
-      sources."parse-json-2.2.0"
-      sources."strip-bom-3.0.0"
-      (sources."error-ex-1.3.1" // {
-        dependencies = [
-          sources."is-arrayish-0.2.1"
-        ];
-      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Git made easy";
       homepage = "https://github.com/FredrikNoren/ungit#readme";
-      license = "MIT";
+      license = "SEE LICENSE IN LICENSE.md";
     };
     production = true;
   };
@@ -36314,7 +37481,7 @@ in
       sources."ini-1.1.0"
       sources."proto-list-1.2.4"
       sources."wrappy-1.0.2"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       (sources."extract-zip-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.0"
@@ -36445,10 +37612,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "3.6.0";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz";
-      sha512 = "12fzgy04c0gwlpr5bn66q92kbnv8wn4sm6xd2mmhc3dwq0fkrl2h1pmad3wh56x8zia8v7s4jcwxndhv8pb9d0y7s7skl0n7pfd7h9s";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz";
+      sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5";
     };
     dependencies = [
       sources."acorn-5.1.2"
@@ -36457,7 +37624,7 @@ in
           sources."acorn-4.0.13"
         ];
       })
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."ajv-keywords-2.1.0"
       sources."async-2.5.0"
       sources."enhanced-resolve-3.4.1"
@@ -36475,7 +37642,7 @@ in
         ];
       })
       sources."source-map-0.5.7"
-      sources."supports-color-4.4.0"
+      sources."supports-color-4.5.0"
       sources."tapable-0.2.8"
       sources."uglifyjs-webpack-plugin-0.4.6"
       sources."watchpack-1.4.0"
@@ -36507,8 +37674,8 @@ in
       sources."esrecurse-4.2.0"
       sources."estraverse-4.2.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.30"
-      sources."es6-iterator-2.0.1"
+      sources."es5-ext-0.10.35"
+      sources."es6-iterator-2.0.3"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
       sources."event-emitter-0.3.5"
@@ -36567,7 +37734,7 @@ in
       sources."pbkdf2-3.0.14"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
-      sources."browserify-aes-1.0.8"
+      sources."browserify-aes-1.1.1"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."buffer-xor-1.0.3"
@@ -36590,8 +37757,8 @@ in
           sources."hash-base-2.0.2"
         ];
       })
-      sources."sha.js-2.4.8"
-      sources."miller-rabin-4.0.0"
+      sources."sha.js-2.4.9"
+      sources."miller-rabin-4.0.1"
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."xtend-4.0.1"
@@ -36675,7 +37842,7 @@ in
       sources."node-pre-gyp-0.6.38"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      (sources."rc-1.2.1" // {
+      (sources."rc-1.2.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -36686,7 +37853,7 @@ in
       sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
-      sources."abbrev-1.1.0"
+      sources."abbrev-1.1.1"
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -36847,6 +38014,839 @@ in
     };
     production = true;
   };
+  web-ext = nodeEnv.buildNodePackage {
+    name = "web-ext";
+    packageName = "web-ext";
+    version = "2.2.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-2.2.2.tgz";
+      sha1 = "5c54be1d5b2e9da3092f5f03ef55d6db372c37e1";
+    };
+    dependencies = [
+      (sources."addons-linter-0.27.0" // {
+        dependencies = [
+          sources."yargs-8.0.2"
+        ];
+      })
+      sources."babel-polyfill-6.20.0"
+      sources."babel-runtime-6.25.0"
+      sources."bunyan-1.8.10"
+      sources."camelcase-4.1.0"
+      sources."debounce-1.0.2"
+      sources."decamelize-1.2.0"
+      sources."es6-error-4.0.2"
+      sources."es6-promisify-5.0.0"
+      sources."event-to-promise-0.8.0"
+      (sources."firefox-profile-0.5.0" // {
+        dependencies = [
+          sources."async-2.1.5"
+        ];
+      })
+      (sources."fx-runner-1.0.8" // {
+        dependencies = [
+          sources."commander-2.9.0"
+          sources."lodash-3.10.1"
+          sources."which-1.2.4"
+          sources."isexe-1.1.2"
+        ];
+      })
+      (sources."git-rev-sync-1.9.1" // {
+        dependencies = [
+          sources."shelljs-0.7.7"
+        ];
+      })
+      sources."minimatch-3.0.4"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."mz-2.6.0"
+      (sources."node-firefox-connect-1.2.0" // {
+        dependencies = [
+          sources."es6-promise-2.3.0"
+        ];
+      })
+      sources."open-0.0.5"
+      sources."node-notifier-5.1.2"
+      sources."parse-json-2.2.0"
+      sources."regenerator-runtime-0.10.5"
+      sources."require-uncached-1.0.3"
+      (sources."sign-addon-0.2.1" // {
+        dependencies = [
+          sources."babel-polyfill-6.16.0"
+          sources."es6-error-4.0.0"
+          sources."mz-2.5.0"
+          sources."request-2.79.0"
+          sources."source-map-support-0.4.6"
+          sources."regenerator-runtime-0.9.6"
+          sources."aws-sign2-0.6.0"
+          sources."caseless-0.11.0"
+          sources."form-data-2.1.4"
+          sources."har-validator-2.0.6"
+          sources."hawk-3.1.3"
+          sources."http-signature-1.1.1"
+          sources."qs-6.3.2"
+          sources."tunnel-agent-0.4.3"
+          sources."chalk-1.1.3"
+          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."source-map-support-0.5.0" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."stream-to-promise-2.2.0" // {
+        dependencies = [
+          sources."end-of-stream-1.1.0"
+          sources."once-1.3.3"
+        ];
+      })
+      sources."tmp-0.0.30"
+      sources."watchpack-1.3.0"
+      (sources."update-notifier-2.2.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
+      (sources."yargs-6.6.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          sources."os-locale-1.4.0"
+          sources."read-pkg-up-1.0.1"
+          sources."string-width-1.0.2"
+          sources."which-module-1.0.0"
+          sources."yargs-parser-4.2.1"
+          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."path-type-1.1.0"
+          sources."strip-bom-2.0.0"
+        ];
+      })
+      (sources."zip-dir-1.0.2" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
+      sources."ajv-5.2.3"
+      (sources."babel-register-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."source-map-support-0.4.18"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      (sources."chalk-2.1.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
+        ];
+      })
+      sources."cheerio-1.0.0-rc.2"
+      sources."columnify-1.5.4"
+      sources."common-tags-1.4.0"
+      sources."crx-parser-0.1.2"
+      sources."doctoc-1.3.0"
+      (sources."dispensary-0.10.19" // {
+        dependencies = [
+          sources."yargs-9.0.1"
+        ];
+      })
+      (sources."eslint-4.8.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
+        dependencies = [
+          sources."eslint-3.19.0"
+          sources."chalk-1.1.3"
+          sources."inquirer-0.12.0"
+          sources."pluralize-1.2.1"
+          sources."progress-1.1.8"
+          (sources."table-3.8.3" // {
+            dependencies = [
+              sources."string-width-2.1.1"
+            ];
+          })
+          sources."ansi-escapes-1.4.0"
+          sources."cli-cursor-1.0.2"
+          sources."figures-1.7.0"
+          sources."run-async-0.1.0"
+          sources."rx-lite-3.1.2"
+          sources."string-width-1.0.2"
+          sources."restore-cursor-1.0.1"
+          sources."onetime-1.1.0"
+          sources."ajv-4.11.8"
+          sources."ajv-keywords-1.5.1"
+          sources."slice-ansi-0.0.4"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."esprima-3.1.3"
+      sources."first-chunk-stream-2.0.0"
+      sources."jed-1.1.1"
+      sources."pino-4.8.0"
+      (sources."postcss-6.0.11" // {
+        dependencies = [
+          sources."supports-color-4.5.0"
+        ];
+      })
+      (sources."relaxed-json-1.0.1" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
+      sources."semver-5.4.1"
+      sources."strip-bom-stream-3.0.0"
+      sources."whatwg-url-6.3.0"
+      sources."xmldom-0.1.27"
+      sources."yauzl-2.8.0"
+      sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      (sources."babel-core-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      sources."core-js-2.5.1"
+      sources."home-or-tmp-2.0.0"
+      sources."lodash-4.17.4"
+      (sources."babel-code-frame-6.26.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
+      (sources."babel-generator-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      (sources."babel-template-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      (sources."babel-traverse-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      (sources."babel-types-6.26.0" // {
+        dependencies = [
+          sources."babel-runtime-6.26.0"
+          sources."regenerator-runtime-0.11.0"
+        ];
+      })
+      sources."babylon-6.18.0"
+      sources."convert-source-map-1.5.0"
+      sources."debug-2.6.9"
+      sources."json5-0.5.1"
+      sources."path-is-absolute-1.0.1"
+      sources."private-0.1.8"
+      sources."slash-1.0.0"
+      sources."source-map-0.5.7"
+      sources."esutils-2.0.2"
+      sources."js-tokens-3.0.2"
+      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.1.1"
+      sources."detect-indent-4.0.0"
+      sources."jsesc-1.3.0"
+      sources."trim-right-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."globals-9.18.0"
+      sources."invariant-2.2.2"
+      sources."loose-envify-1.3.1"
+      sources."to-fast-properties-1.0.3"
+      sources."ms-2.0.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."css-select-1.2.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."entities-1.1.1"
+      sources."htmlparser2-3.9.2"
+      sources."parse5-3.0.2"
+      sources."css-what-2.1.0"
+      sources."domutils-1.5.1"
+      sources."boolbase-1.0.0"
+      sources."nth-check-1.0.1"
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.4.1"
+      sources."inherits-2.0.3"
+      sources."readable-stream-2.3.3"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."@types/node-6.0.90"
+      sources."wcwidth-1.0.1"
+      sources."defaults-1.0.3"
+      sources."clone-1.0.2"
+      sources."anchor-markdown-header-0.5.7"
+      sources."markdown-to-ast-3.4.0"
+      sources."minimist-1.2.0"
+      sources."underscore-1.8.3"
+      sources."update-section-0.3.3"
+      sources."emoji-regex-6.1.3"
+      sources."remark-5.1.0"
+      sources."structured-source-3.0.2"
+      sources."traverse-0.6.6"
+      sources."remark-parse-1.1.0"
+      sources."remark-stringify-1.1.0"
+      sources."unified-4.2.1"
+      sources."collapse-white-space-1.0.3"
+      sources."extend-3.0.1"
+      sources."parse-entities-1.1.1"
+      sources."repeat-string-1.6.1"
+      sources."trim-0.0.1"
+      sources."trim-trailing-lines-1.1.0"
+      sources."unherit-1.1.0"
+      sources."unist-util-remove-position-1.1.1"
+      sources."vfile-location-2.0.2"
+      sources."character-entities-1.2.1"
+      sources."character-entities-legacy-1.1.1"
+      sources."character-reference-invalid-1.1.1"
+      sources."is-alphanumerical-1.0.1"
+      sources."is-decimal-1.0.1"
+      sources."is-hexadecimal-1.0.1"
+      sources."is-alphabetical-1.0.1"
+      sources."xtend-4.0.1"
+      sources."unist-util-visit-1.1.3"
+      sources."ccount-1.0.2"
+      sources."longest-streak-1.0.0"
+      sources."markdown-table-0.4.0"
+      sources."stringify-entities-1.3.1"
+      sources."character-entities-html4-1.1.1"
+      sources."bail-1.0.2"
+      sources."has-1.0.1"
+      sources."once-1.4.0"
+      sources."trough-1.0.1"
+      sources."vfile-1.4.0"
+      sources."function-bind-1.1.1"
+      sources."wrappy-1.0.2"
+      sources."boundary-1.0.1"
+      sources."array-from-2.1.1"
+      sources."async-2.5.0"
+      sources."natural-compare-lite-1.4.0"
+      sources."request-2.83.0"
+      sources."sha.js-2.4.9"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.1"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."http-signature-1.2.0"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-types-2.1.17"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."qs-6.5.1"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.3"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."har-schema-2.0.0"
+      sources."hoek-4.2.0"
+      sources."boom-4.3.1"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
+      sources."sntp-2.0.2"
+      sources."assert-plus-1.0.0"
+      sources."jsprim-1.4.1"
+      sources."sshpk-1.13.1"
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      sources."verror-1.10.0"
+      sources."asn1-0.2.3"
+      sources."dashdash-1.14.1"
+      sources."getpass-0.1.7"
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."mime-db-1.30.0"
+      sources."punycode-1.4.1"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."read-pkg-up-2.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."which-module-2.0.0"
+      sources."y18n-3.2.1"
+      sources."yargs-parser-7.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."execa-0.7.0"
+      sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
+      sources."invert-kv-1.0.0"
+      sources."mimic-fn-1.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
+      sources."load-json-file-2.0.0"
+      sources."normalize-package-data-2.4.0"
+      sources."path-type-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."pify-2.3.0"
+      sources."strip-bom-3.0.0"
+      sources."hosted-git-info-2.5.0"
+      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."concat-stream-1.6.0"
+      sources."doctrine-2.0.0"
+      sources."eslint-scope-3.7.1"
+      sources."espree-3.5.1"
+      sources."esquery-1.0.0"
+      sources."estraverse-4.2.0"
+      sources."file-entry-cache-2.0.0"
+      sources."functional-red-black-tree-1.0.1"
+      sources."glob-7.1.2"
+      sources."ignore-3.3.6"
+      sources."imurmurhash-0.1.4"
+      (sources."inquirer-3.3.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."is-resolvable-1.0.0"
+      (sources."js-yaml-3.10.0" // {
+        dependencies = [
+          sources."esprima-4.0.0"
+        ];
+      })
+      sources."levn-0.3.0"
+      sources."natural-compare-1.4.0"
+      sources."optionator-0.8.2"
+      sources."path-is-inside-1.0.2"
+      sources."pluralize-7.0.0"
+      sources."progress-2.0.0"
+      sources."strip-json-comments-2.0.1"
+      sources."table-4.0.2"
+      sources."text-table-0.2.0"
+      sources."typedarray-0.0.6"
+      sources."esrecurse-4.2.0"
+      sources."object-assign-4.1.1"
+      sources."acorn-5.1.2"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      sources."flat-cache-1.3.0"
+      sources."circular-json-0.3.3"
+      sources."del-2.2.2"
+      sources."write-0.2.1"
+      sources."globby-5.0.0"
+      sources."is-path-cwd-1.0.0"
+      sources."is-path-in-cwd-1.0.0"
+      sources."pinkie-promise-2.0.1"
+      sources."rimraf-2.6.2"
+      sources."array-union-1.0.2"
+      sources."arrify-1.0.1"
+      sources."array-uniq-1.0.3"
+      sources."is-path-inside-1.0.0"
+      sources."pinkie-2.0.4"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."ansi-escapes-3.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      (sources."external-editor-2.0.5" // {
+        dependencies = [
+          sources."tmp-0.0.33"
+        ];
+      })
+      sources."figures-2.0.0"
+      sources."mute-stream-0.0.7"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      sources."through-2.3.8"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."iconv-lite-0.4.19"
+      sources."jschardet-1.5.1"
+      sources."is-promise-2.1.0"
+      sources."tryit-1.0.3"
+      sources."argparse-1.0.9"
+      sources."sprintf-js-1.0.3"
+      sources."prelude-ls-1.1.2"
+      sources."type-check-0.3.2"
+      sources."deep-is-0.1.3"
+      sources."wordwrap-1.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."ajv-keywords-2.1.0"
+      (sources."slice-ansi-1.0.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."escope-3.6.0"
+      sources."is-my-json-valid-2.16.1"
+      sources."shelljs-0.7.8"
+      sources."user-home-2.0.0"
+      sources."es6-map-0.1.5"
+      sources."es6-weak-map-2.0.2"
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.35"
+      sources."es6-iterator-2.0.3"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."event-emitter-0.3.5"
+      (sources."readline2-1.0.1" // {
+        dependencies = [
+          sources."mute-stream-0.0.5"
+        ];
+      })
+      sources."exit-hook-1.1.1"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.1"
+      sources."is-property-1.0.2"
+      sources."interpret-1.0.4"
+      sources."rechoir-0.6.2"
+      sources."resolve-1.4.0"
+      sources."path-parse-1.0.5"
+      sources."fast-json-parse-1.0.3"
+      sources."fast-safe-stringify-1.2.0"
+      sources."flatstr-1.0.5"
+      sources."pump-1.0.2"
+      sources."quick-format-unescaped-1.1.1"
+      sources."split2-2.2.0"
+      sources."end-of-stream-1.4.0"
+      sources."through2-2.0.3"
+      sources."commander-2.11.0"
+      sources."strip-bom-buf-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."lodash.sortby-4.7.0"
+      (sources."tr46-1.0.1" // {
+        dependencies = [
+          sources."punycode-2.1.0"
+        ];
+      })
+      sources."webidl-conversions-4.0.2"
+      sources."fd-slicer-1.0.1"
+      sources."buffer-crc32-0.2.13"
+      sources."pend-1.2.0"
+      sources."dtrace-provider-0.8.5"
+      (sources."mv-2.1.1" // {
+        dependencies = [
+          sources."rimraf-2.4.5"
+          sources."glob-6.0.4"
+        ];
+      })
+      sources."safe-json-stringify-1.0.4"
+      sources."moment-2.19.1"
+      sources."nan-2.7.0"
+      sources."ncp-2.0.0"
+      sources."es6-promise-4.1.1"
+      sources."adm-zip-0.4.7"
+      sources."archiver-1.3.0"
+      sources."fs-extra-2.1.2"
+      sources."ini-1.3.4"
+      sources."jetpack-id-1.0.0"
+      sources."lazystream-1.0.0"
+      sources."xml2js-0.4.19"
+      sources."archiver-utils-1.3.0"
+      sources."tar-stream-1.5.4"
+      sources."zip-stream-1.2.0"
+      sources."walkdir-0.0.11"
+      sources."normalize-path-2.1.1"
+      sources."remove-trailing-separator-1.1.0"
+      sources."bl-1.2.1"
+      sources."compress-commons-1.2.2"
+      sources."crc32-stream-2.0.0"
+      sources."crc-3.5.0"
+      sources."jsonfile-2.4.0"
+      sources."sax-1.2.4"
+      sources."xmlbuilder-9.0.4"
+      sources."shell-quote-1.6.1"
+      sources."spawn-sync-1.0.15"
+      sources."when-3.7.7"
+      sources."winreg-0.0.12"
+      sources."graceful-readlink-1.0.1"
+      sources."array-filter-0.0.1"
+      sources."array-reduce-0.0.0"
+      sources."array-map-0.0.0"
+      sources."os-shim-0.1.3"
+      sources."is-absolute-0.1.7"
+      sources."is-relative-0.1.3"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."any-promise-1.3.0"
+      sources."thenify-all-1.6.0"
+      sources."thenify-3.3.0"
+      sources."firefox-client-0.3.0"
+      sources."colors-0.5.1"
+      (sources."js-select-0.6.0" // {
+        dependencies = [
+          sources."traverse-0.4.6"
+        ];
+      })
+      sources."JSONSelect-0.2.1"
+      sources."growly-1.3.0"
+      sources."shellwords-0.1.1"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."caller-path-0.1.0"
+      sources."resolve-from-1.0.1"
+      sources."callsites-0.2.0"
+      sources."deepcopy-0.6.3"
+      (sources."jsonwebtoken-7.1.9" // {
+        dependencies = [
+          sources."ms-0.7.3"
+        ];
+      })
+      (sources."joi-6.10.1" // {
+        dependencies = [
+          sources."hoek-2.16.3"
+        ];
+      })
+      sources."jws-3.1.4"
+      sources."lodash.once-4.1.1"
+      (sources."topo-1.1.0" // {
+        dependencies = [
+          sources."hoek-2.16.3"
+        ];
+      })
+      sources."isemail-1.2.0"
+      sources."base64url-2.0.0"
+      sources."jwa-1.1.5"
+      sources."buffer-equal-constant-time-1.0.1"
+      sources."ecdsa-sig-formatter-1.0.9"
+      sources."stream-to-array-2.3.0"
+      sources."chokidar-1.7.0"
+      sources."anymatch-1.3.2"
+      sources."async-each-1.0.1"
+      sources."glob-parent-2.0.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-glob-2.0.1"
+      sources."readdirp-2.1.0"
+      sources."fsevents-1.1.2"
+      sources."micromatch-2.3.11"
+      sources."arr-diff-2.0.0"
+      sources."array-unique-0.2.1"
+      sources."braces-1.8.5"
+      sources."expand-brackets-0.1.5"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."is-extglob-1.0.0"
+      sources."kind-of-3.2.2"
+      sources."object.omit-2.0.1"
+      sources."parse-glob-3.0.4"
+      sources."regex-cache-0.4.4"
+      sources."arr-flatten-1.1.0"
+      sources."expand-range-1.8.2"
+      sources."preserve-0.2.0"
+      sources."repeat-element-1.1.2"
+      sources."fill-range-2.2.3"
+      sources."is-number-2.1.0"
+      sources."isobject-2.1.0"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."is-buffer-1.1.5"
+      sources."is-posix-bracket-0.1.1"
+      sources."for-own-0.1.5"
+      sources."is-extendable-0.1.1"
+      sources."for-in-1.0.2"
+      sources."glob-base-0.3.0"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-primitive-2.0.0"
+      sources."binary-extensions-1.10.0"
+      sources."set-immediate-shim-1.0.1"
+      (sources."node-pre-gyp-0.6.38" // {
+        dependencies = [
+          sources."request-2.81.0"
+          sources."hawk-3.1.3"
+          sources."aws-sign2-0.6.0"
+          sources."form-data-2.1.4"
+          sources."har-validator-4.2.1"
+          sources."http-signature-1.1.1"
+          sources."performance-now-0.2.0"
+          sources."qs-6.4.0"
+          sources."ajv-4.11.8"
+          sources."har-schema-1.0.5"
+          sources."assert-plus-0.2.0"
+          sources."hoek-2.16.3"
+          sources."boom-2.10.1"
+          sources."cryptiles-2.0.5"
+          sources."sntp-1.0.9"
+        ];
+      })
+      sources."nopt-4.0.1"
+      sources."npmlog-4.1.2"
+      sources."rc-1.2.2"
+      sources."tar-2.2.1"
+      sources."tar-pack-3.4.0"
+      sources."abbrev-1.1.1"
+      sources."osenv-0.1.4"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."delegates-1.0.0"
+      sources."aproba-1.2.0"
+      sources."has-unicode-2.0.1"
+      (sources."wide-align-1.1.2" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."deep-extend-0.4.2"
+      sources."block-stream-0.0.9"
+      sources."fstream-1.0.11"
+      sources."fstream-ignore-1.0.5"
+      sources."uid-number-0.0.6"
+      sources."boxen-1.2.2"
+      sources."configstore-3.1.1"
+      sources."import-lazy-2.1.0"
+      sources."is-npm-1.0.0"
+      sources."latest-version-3.1.0"
+      sources."semver-diff-2.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."ansi-align-2.0.0"
+      sources."cli-boxes-1.0.0"
+      sources."term-size-1.2.0"
+      (sources."widest-line-1.0.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."dot-prop-4.2.0"
+      (sources."make-dir-1.1.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."is-obj-1.0.1"
+      sources."crypto-random-string-1.0.0"
+      sources."package-json-4.0.1"
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.3.1"
+      sources."registry-url-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+      sources."jszip-2.6.1"
+      sources."pako-1.0.6"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A command line tool to help build, run, and test web extensions";
+      homepage = https://github.com/mozilla/web-ext;
+      license = "MPL-2.0";
+    };
+    production = true;
+  };
   wring = nodeEnv.buildNodePackage {
     name = "wring";
     packageName = "wring";
@@ -36866,10 +38866,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.0.2";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.0.2.tgz";
-      sha1 = "d1b8f4b6d3b0684e86f63a072ac630995b8b7b0a";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.2.1.tgz";
+      sha1 = "0d628dc01438881a1663a6f83cbf7ac5db7a75fc";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36899,10 +38899,10 @@ in
       sources."humanize-string-1.0.1"
       (sources."inquirer-3.3.0" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -36956,6 +38956,7 @@ in
           sources."read-pkg-2.0.0"
           sources."load-json-file-2.0.0"
           sources."path-type-2.0.0"
+          sources."pify-2.3.0"
           sources."strip-bom-3.0.0"
         ];
       })
@@ -36978,7 +38979,13 @@ in
         ];
       })
       sources."titleize-1.0.0"
-      sources."update-notifier-2.2.0"
+      (sources."update-notifier-2.3.0" // {
+        dependencies = [
+          sources."chalk-2.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
+        ];
+      })
       sources."user-home-2.0.0"
       (sources."yeoman-character-1.1.0" // {
         dependencies = [
@@ -36987,7 +38994,15 @@ in
         ];
       })
       sources."yeoman-doctor-2.1.0"
-      sources."yeoman-environment-2.0.3"
+      (sources."yeoman-environment-2.0.5" // {
+        dependencies = [
+          sources."chalk-2.2.0"
+          sources."debug-3.1.0"
+          sources."log-symbols-2.1.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.5.0"
+        ];
+      })
       (sources."yosay-2.0.1" // {
         dependencies = [
           sources."ansi-styles-3.2.0"
@@ -37001,12 +39016,12 @@ in
       sources."ansi-regex-2.1.1"
       sources."dot-prop-4.2.0"
       sources."graceful-fs-4.1.11"
-      sources."make-dir-1.0.0"
+      sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
       sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."signal-exit-3.0.2"
@@ -37025,11 +39040,12 @@ in
       (sources."passwd-user-2.1.0" // {
         dependencies = [
           sources."execa-0.4.0"
+          sources."pify-2.3.0"
           sources."npm-run-path-1.0.0"
           sources."path-key-1.0.0"
         ];
       })
-      sources."rc-1.2.1"
+      sources."rc-1.2.2"
       sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
@@ -37087,7 +39103,7 @@ in
       sources."is-fullwidth-code-point-2.0.0"
       sources."lodash.debounce-3.1.1"
       sources."os-name-1.0.3"
-      sources."request-2.82.0"
+      sources."request-2.83.0"
       sources."tough-cookie-2.3.3"
       sources."uuid-3.1.0"
       (sources."mkdirp-0.5.1" // {
@@ -37134,7 +39150,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
+      sources."ajv-5.2.4"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -37190,8 +39206,16 @@ in
       sources."path-exists-2.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      (sources."path-type-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."parse-json-2.2.0"
       sources."strip-bom-2.0.0"
       sources."error-ex-1.3.1"
@@ -37245,15 +39269,16 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      (sources."boxen-1.2.1" // {
+      (sources."boxen-1.2.2" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."chalk-2.1.0"
+          sources."chalk-2.2.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.4.0"
+          sources."supports-color-4.5.0"
         ];
       })
       sources."import-lazy-2.1.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       (sources."latest-version-3.1.0" // {
         dependencies = [
@@ -37274,6 +39299,9 @@ in
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
+      sources."global-dirs-0.1.0"
+      sources."is-path-inside-1.0.0"
+      sources."path-is-inside-1.0.2"
       (sources."bin-version-check-2.1.0" // {
         dependencies = [
           sources."semver-4.3.6"
@@ -37299,8 +39327,12 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."diff-3.3.1"
-      sources."globby-6.1.0"
+      sources."diff-3.4.0"
+      (sources."globby-6.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."grouped-queue-0.3.3"
       sources."is-scoped-1.0.0"
       sources."mem-fs-1.1.3"
@@ -37314,7 +39346,11 @@ in
       sources."scoped-regex-1.0.0"
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
-      sources."vinyl-file-2.0.0"
+      (sources."vinyl-file-2.0.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."xtend-4.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -37338,4 +39374,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file

From acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Mon, 23 Oct 2017 18:49:58 +0800
Subject: [PATCH 34/97] git-crypt: add runtime dependencies to PATH

git-crypt won't work if git and git-crypt are not in PATH. This surfaced
after dbb8958. Test like this:

```
PATH= $(nix-build --no-out-link '<nixpkgs>' --attr git-crypt)/bin/git-crypt unlock
```
---
 .../version-management/git-and-tools/git-crypt/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 98cce617833..0d6b206cb4a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, gnupg1compat, makeWrapper }:
+{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     make install PREFIX=$out
-    wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin
+    wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin
   '';
 
   meta = with stdenv.lib; {

From 3ee70f64f0df0fdb281b7277fb6b9420e756647e Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Mon, 23 Oct 2017 13:35:47 +0200
Subject: [PATCH 35/97] libreoffice: add Italian language

Added the Italian language to the list of supported languages for Nix.
---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 pkgs/applications/office/libreoffice/still.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830692f08eb..830ae68fd1b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index dfe6e947080..a3991b8b35c 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -13,7 +13,7 @@
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
 , defaultIconTheme, glib, ncurses
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
 , kdeIntegration ? false
 }:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
   # It also seems not to mention libdl explicitly in some places.
   NIX_LDFLAGS = "-lcups -ldl";
 
-  # For some reason librdf_redland sometimes refers to rasqal.h instead 
+  # For some reason librdf_redland sometimes refers to rasqal.h instead
   # of rasqal/rasqal.h
   NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 

From 7144f88c482df8baf1d045f47f8f8d1ed9090175 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 23 Oct 2017 13:59:37 +0200
Subject: [PATCH 36/97] open-vm-tools: Fix rebooting on NixOS

---
 pkgs/applications/virtualization/open-vm-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index bc280823a3c..c7f8ea696b5 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
 
      # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
      sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c
+
+     # Make reboot work, shutdown is not in /sbin on NixOS
+     sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
   '';
 
   configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]

From 124e462455bd2d980fde2461b41fabdb9387b3d1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Oct 2017 08:46:15 -0400
Subject: [PATCH 37/97] git: 2.14.2 -> 2.14.3

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 51f523305d1..b3c642de9b2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.14.2";
+  version = "2.14.3";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "18f70gfzwqd210806hmf94blcd7yv5h9ka6xqkpd2jhijqwp5sah";
+    sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k";
   };
 
   hardeningDisable = [ "format" ];

From 4ea79d3f365c90ab22b66cb499a2a0532f9469ef Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Oct 2017 08:49:39 -0400
Subject: [PATCH 38/97] linux: 4.14-rc5 -> 4.14-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index fe5cd8989de..3a8d82cdb26 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.14-rc5";
-  modDirVersion = "4.14.0-rc5";
+  version = "4.14-rc6";
+  modDirVersion = "4.14.0-rc6";
   extraMeta.branch = "4.14";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1y383vw79jhpr15s919xwzxif2y8zbiwa64sg2aan075xfhzijp8";
+    sha256 = "0gmxrf4jmw8xl5gx487chyx94yas7rva5jbkczm9iw9sw0c8gwcb";
   };
 
   # Should the testing kernels ever be built on Hydra?

From bed5bb1f5e9c315070759ef2952d7b1ab1816132 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Oct 2017 15:12:39 +0200
Subject: [PATCH 39/97] fix eval

cc @zimbatm

(https://nix-cache.s3.amazonaws.com/log/iyn9cwk0kymi4mzva0dzpqwnzm3cg4a4-nixpkgs-tarball-18.03pre118395.891c3721ed.drv)
---
 pkgs/development/compilers/rust/cargo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 5225e95b1e1..682e85ce867 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -56,6 +56,6 @@ rustPlatform.buildRustPackage rec {
     description = "Downloads your Rust project's dependencies and builds your project";
     maintainers = with maintainers; [ wizeman retrry ];
     license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 7b3a61af73fad347d52af7f950cddf6ca36fdcdb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 23 Oct 2017 14:53:14 +0200
Subject: [PATCH 40/97] gogland: fix debugger

---
 pkgs/applications/editors/jetbrains/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b18b27d9c2c..41ad3164d6a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -78,7 +78,7 @@ let
     });
 
   buildGogland = { name, version, src, license, description, wmClass, update-channel }:
-    (mkJetBrainsProduct {
+    lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "Gogland";
       meta = with stdenv.lib; {
@@ -93,6 +93,13 @@ let
         maintainers = [ maintainers.miltador ];
         platforms = platforms.linux;
       };
+    }) (attrs: {
+      postFixup = (attrs.postFixup or "") + ''
+        interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+        patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+
+        chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+      '';
     });
 
   buildIdea = { name, version, src, license, description, wmClass, update-channel }:

From ab409e01c9013a8e929ec2542645607f77a99663 Mon Sep 17 00:00:00 2001
From: fusion809 <brentonhorne77@gmail.com>
Date: Mon, 23 Oct 2017 23:34:56 +1000
Subject: [PATCH 41/97] Bumping to 1.2.0

Per #30719 I am bumping to version 1.2.0.
---
 pkgs/applications/editors/notepadqq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 9b3896e32d6..6d1bba8c4d5 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}:
 
 let
-  version = "0.53.0";
+  version = "1.2.0";
 in stdenv.mkDerivation {
   name = "notepadqq-${version}";
   src = fetchgit {
     url = "https://github.com/notepadqq/notepadqq.git";
-    rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b";
-    sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi";
+    rev = "ab074d30e02d49e0fe6957c1523e7fed239aff7d";
+    sha256 = "0j8vqsdw314qpk5lrgccm9n7gbyr14ac3s65sl1qn87pxhrz1hpg";
     fetchSubmodules = true;
   };
 

From acf1ae02dcaee644704a12866c434eee2a6a5a65 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Oct 2017 23:43:56 +0300
Subject: [PATCH 42/97] libx86: Supports only x86

In theory it builds for 32-bit ARM but the result probably doesn't
work in a meaningful manner...
---
 pkgs/development/libraries/libx86/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 162d284f402..d73d67a39cf 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$(out)"
-  ] ++ stdenv.lib.optional (stdenv.isx86_64 || stdenv.isArm) "BACKEND=x86emu";
+  ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu";
 
   preBuild = ''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Real-mode x86 code emulator";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux ++ freebsd ++ netbsd;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     license = licenses.mit;
   };
 }

From 681c8006f5ea89f949880b6bc05d29a5422c6320 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Oct 2017 23:45:00 +0300
Subject: [PATCH 43/97] read-edid: Only depend on libx86 on x86

---
 pkgs/os-specific/linux/read-edid/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix
index fdf2c4c9f12..3e57bbc11bd 100644
--- a/pkgs/os-specific/linux/read-edid/default.nix
+++ b/pkgs/os-specific/linux/read-edid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libx86 }:
+{ stdenv, lib, fetchurl, cmake, libx86 }:
 
 stdenv.mkDerivation rec {
   name = "read-edid-${version}";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7";
   };
 
-  buildInputs = [ cmake libx86 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;
+
+  cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.isi686 || stdenv.isx86_64 then "ON" else "OFF"}" ];
 
   patchPhase = ''
     substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE'

From 61089ddceec7d05a05efd4db9bbdf4b45d102b9c Mon Sep 17 00:00:00 2001
From: joachim schiele <js@lastlog.de>
Date: Wed, 13 Sep 2017 12:13:08 +0200
Subject: [PATCH 44/97] opendkim: automated key generation (no manual changes
 for service initialization required anymore)

---
 nixos/modules/rename.nix                 |  3 +++
 nixos/modules/services/mail/opendkim.nix | 26 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b1b3f67a41d..f30cbe427f0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -112,6 +112,9 @@ with lib;
 
     (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
 
+    # opendkim
+    (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
+
     # XBMC
     (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index f065208ddfc..59a8373843a 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -8,10 +8,12 @@ let
 
   defaultSock = "local:/run/opendkim/opendkim.sock";
 
+  keyFile = "${cfg.keyPath}/${cfg.selector}.private";
+
   args = [ "-f" "-l"
            "-p" cfg.socket
            "-d" cfg.domains
-           "-k" cfg.keyFile
+           "-k" keyFile
            "-s" cfg.selector
          ] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
 
@@ -57,9 +59,13 @@ in {
         '';
       };
 
-      keyFile = mkOption {
+      keyPath = mkOption {
         type = types.path;
-        description = "Secret key file used for signing messages.";
+        description = ''
+          The path that opendkim should put its generated private keys into.
+          The DNS settings will be found in this directory with the name selector.txt.
+        '';
+        default = "/var/lib/opendkim/keys";
       };
 
       selector = mkOption {
@@ -100,11 +106,25 @@ in {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      preStart = ''
+        mkdir -p "${cfg.keyPath}"
+        cd "${cfg.keyPath}"
+        if ! test -f ${cfg.selector}.private; then
+          ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key
+          echo "Generated OpenDKIM key! Please update your DNS settings:\n"
+          echo "-------------------------------------------------------------"
+          cat ${cfg.selector}.txt
+          echo "-------------------------------------------------------------"
+        fi
+        chown ${cfg.user}:${cfg.group} ${cfg.selector}.private
+      '';
+
       serviceConfig = {
         ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";
         User = cfg.user;
         Group = cfg.group;
         RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
+        PermissionsStartOnly = true;
       };
     };
 

From 02f4079fce5d7914c5ffe443fa2cf27b89f439e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Oct 2017 17:18:10 +0200
Subject: [PATCH 45/97] LTS Haskell 9.10

---
 .../configuration-hackage2nix.yaml            | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7e286926af0..8de2749004e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 9.9
+  # LTS Haskell 9.10
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -801,7 +801,7 @@ default-package-overrides:
   - gitson ==0.5.2
   - gi-webkit ==3.0.14
   - gl ==0.8.0
-  - glabrous ==0.3.2
+  - glabrous ==0.3.3
   - glaze ==0.3.0.1
   - glazier ==0.11.0.1
   - glazier-pipes ==0.1.5.1
@@ -998,7 +998,7 @@ default-package-overrides:
   - hasmin ==0.3.3
   - hasql ==0.19.18.2
   - hasql-migration ==0.1.3
-  - hasql-pool ==0.4.1
+  - hasql-pool ==0.4.2.1
   - hasql-transaction ==0.5.1
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.3.0
@@ -1024,7 +1024,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.5
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.9
+  - hedis ==0.9.10
   - here ==1.2.11
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.0
@@ -1248,7 +1248,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.1.1
   - jailbreak-cabal ==1.3.2
-  - javascript-extras ==0.3.1.0
+  - javascript-extras ==0.3.2.0
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
@@ -1271,7 +1271,7 @@ default-package-overrides:
   - jwt ==0.7.2
   - kan-extensions ==5.0.2
   - kansas-comet ==0.4
-  - katip ==0.5.0.3
+  - katip ==0.5.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
   - keter ==1.4.3.2
@@ -1490,7 +1490,7 @@ default-package-overrides:
   - mysql ==0.1.4
   - mysql-haskell ==0.8.0.0
   - mysql-haskell-openssl ==0.8.0.0
-  - mysql-simple ==0.4.3
+  - mysql-simple ==0.4.4
   - nagios-check ==0.3.2
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
@@ -1638,7 +1638,7 @@ default-package-overrides:
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
   - persistent-sqlite ==2.6.2
-  - persistent-template ==2.5.2
+  - persistent-template ==2.5.3
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
@@ -1649,13 +1649,13 @@ default-package-overrides:
   - pinboard ==0.9.12.5
   - pinch ==0.3.2.0
   - pinchot ==0.24.0.0
-  - pipes ==4.3.5
+  - pipes ==4.3.6
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
   - pipes-cacophony ==0.5.0
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.8
-  - pipes-extras ==1.0.11
+  - pipes-extras ==1.0.12
   - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.8
   - pipes-misc ==0.3.0.0
@@ -1716,7 +1716,7 @@ default-package-overrides:
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - pretty-show ==1.6.13
-  - pretty-simple ==2.0.0.0
+  - pretty-simple ==2.0.1.0
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
   - primitive ==0.6.2.0
@@ -1752,7 +1752,7 @@ default-package-overrides:
   - publicsuffix ==0.20170508
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript-bridge ==0.11.0.0
+  - purescript-bridge ==0.11.1.0
   - pusher-http-haskell ==1.2.0.1
   - pwstore-fast ==2.4.4
   - QuasiText ==0.1.2.6
@@ -2096,7 +2096,7 @@ default-package-overrides:
   - tar ==0.5.0.3
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
-  - tasty ==0.11.2.5
+  - tasty ==0.11.3
   - tasty-ant-xml ==1.1.0
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==0.6.0.0
@@ -2283,7 +2283,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.4.3.1
   - unix-time ==0.3.7
-  - unliftio ==0.1.0.0
+  - unliftio ==0.1.1.0
   - unliftio-core ==0.1.0.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
@@ -2325,7 +2325,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.1.1
   - vhd ==0.2.2
-  - ViennaRNAParser ==1.3.2
+  - ViennaRNAParser ==1.3.3
   - viewprof ==0.0.0.10
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0

From 714edcad24af38534958543cd5c6bf7d123da4a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Oct 2017 03:00:34 +0200
Subject: [PATCH 46/97] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4932dd52cbb0f9bb843dfffcac595c5c0a0d61c5.
---
 .../haskell-modules/hackage-packages.nix      | 1402 +++++++++++++----
 1 file changed, 1076 insertions(+), 326 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a59b296b8f3..b9b9e75c859 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -280,8 +280,8 @@ self: {
      }:
      mkDerivation {
        pname = "ADPfusionSet";
-       version = "0.0.0.1";
-       sha256 = "0prhxzvg489z2s77djay7airflfdgvvxx2d262gj7yz6945l6nyb";
+       version = "0.0.0.2";
+       sha256 = "05ziz4liywh2kawi4nk7ldh65k3yn3zcbmqk0vs9vy3jc2niyk7g";
        libraryHaskellDepends = [
          ADPfusion base bits containers DPutils mmorph mtl OrderedBits
          primitive PrimitiveArray QuickCheck strict template-haskell
@@ -6503,8 +6503,8 @@ self: {
      }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "2.2.0.0";
-       sha256 = "19f5prpnf3c3ga85ad1s1q5nl78n67iva5cwppkqklc15w0ad3rs";
+       version = "2.3.0.0";
+       sha256 = "1xwmkr68x7mmmimx8kp2fjrfkg02fmsm0wzy93fqsdbs5vi1jqch";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -10280,6 +10280,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IPv6DB_0_2_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
+     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
+     , optparse-applicative, text, unordered-containers, vector, wai
+     , wai-logger, warp
+     }:
+     mkDerivation {
+       pname = "IPv6DB";
+       version = "0.2.3";
+       sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
+         optparse-applicative text unordered-containers vector wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types vector
+       ];
+       homepage = "http://ipv6db.cybervisible.com";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -18283,14 +18313,14 @@ self: {
      }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.3.2";
-       sha256 = "0i581xpg9qmqw2pbkqj82xv8p0c9x12a7k9h3gq3vvkplkqlvzys";
+       version = "1.3.3";
+       sha256 = "1zmfzdp28g9mz99yp2kv98g745a2p4cls4553izcbc5q0v8l3sby";
        libraryHaskellDepends = [
          base parsec ParsecTools process transformers
        ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "Villefort" = callPackage
@@ -21289,7 +21319,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_2_2_0" = callPackage
+  "aeson_1_2_3_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
@@ -21301,8 +21331,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.2.2.0";
-       sha256 = "1ziwbwy2zkms3sknrq2iz6h0hdd372qvrsjrbnyknxx2p4cfr7hg";
+       version = "1.2.3.0";
+       sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -26059,37 +26089,36 @@ self: {
 
   "api-tools" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base
-     , base64-bytestring, bytestring, Cabal, case-insensitive
-     , containers, deepseq, happy, lens, old-locale, QuickCheck
-     , regex-compat-tdfa, safe, safecopy, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , unordered-containers, vector
+     , base16-bytestring, base64-bytestring, binary, bytestring, Cabal
+     , case-insensitive, cborg, containers, deepseq, happy, lens
+     , QuickCheck, regex-compat-tdfa, safe, safecopy, scientific
+     , serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "api-tools";
-       version = "0.5.2";
-       sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6";
-       revision = "1";
-       editedCabalFile = "0mmay0si68ib7slc044fjxcsylg2499gn6i2migfi0v07qdc3na3";
+       version = "0.8.0.1";
+       sha256 = "19a2g5rym3cydbdb9b6x0rm7xdw2m5ckqdzb02yblx9pv045nfzx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty array attoparsec base base64-bytestring
-         bytestring Cabal case-insensitive containers deepseq lens
-         old-locale QuickCheck regex-compat-tdfa safe safecopy
-         template-haskell text time unordered-containers vector
+         aeson aeson-pretty array attoparsec base base16-bytestring
+         base64-bytestring binary bytestring Cabal case-insensitive cborg
+         containers deepseq lens QuickCheck regex-compat-tdfa safe safecopy
+         scientific serialise template-haskell text time
+         unordered-containers vector
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
-         bytestring case-insensitive containers lens old-locale QuickCheck
-         regex-compat-tdfa safe safecopy template-haskell text time
-         unordered-containers vector
+         bytestring case-insensitive cborg containers deepseq lens
+         QuickCheck regex-compat-tdfa safe safecopy serialise
+         template-haskell text time unordered-containers vector
        ];
        testHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
-         bytestring Cabal case-insensitive containers lens old-locale
-         QuickCheck regex-compat-tdfa safe safecopy tasty tasty-hunit
+         bytestring Cabal case-insensitive cborg containers lens QuickCheck
+         regex-compat-tdfa safe safecopy serialise tasty tasty-hunit
          tasty-quickcheck template-haskell text time unordered-containers
          vector
        ];
@@ -31381,6 +31410,8 @@ self: {
        pname = "basement";
        version = "0.0.3";
        sha256 = "06jwanjdd3dw2n6i1c77513abin113f90nsj9vals8krgvq8jnr7";
+       revision = "1";
+       editedCabalFile = "1abv3p6y527vfg69y8fxvmgfi0mrrcvr1gvi9f0hvnq7vc2zs6jw";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Foundation scrap box of array & string";
@@ -34636,17 +34667,20 @@ self: {
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck
-     , template-haskell, th-lift-instances
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , hspec, QuickCheck, template-haskell, th-lift-instances, vector
      }:
      mkDerivation {
        pname = "bitset-word8";
-       version = "0.1.0.1";
-       sha256 = "1lsjaxv7858r5xl8a0lffghlmj3w853ndmmfybki7cfwcqr3mhk2";
+       version = "0.1.1.0";
+       sha256 = "01lvkz6j925pfbh5ik1imxjpf8idvm7bxpp63jxmslsz7pnyvs8l";
        libraryHaskellDepends = [
-         base bytestring containers template-haskell th-lift-instances
+         base containers template-haskell th-lift-instances
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq vector
+       ];
        homepage = "https://github.com/nshimaza/bitset-word8#readme";
        description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
        license = stdenv.lib.licenses.mit;
@@ -34976,6 +35010,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6.1";
        sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6";
+       revision = "1";
+       editedCabalFile = "16r1hhdk592da4xpzhscn7zcxczla4vmr2klj968wgnrx8ky5kqy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
@@ -38260,8 +38296,8 @@ self: {
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
        pname = "c2hs-extra";
-       version = "0.1.0.0";
-       sha256 = "0gcbapdxcdv0bfyh5j4575kx23ygz7mpbir9rcdar5dvp9aslbzj";
+       version = "0.1.0.1";
+       sha256 = "1vasv9gwsvb3l5faka11rs0rr0h0gwif76bkk49n9pvxskqla9sk";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
@@ -42019,17 +42055,16 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "chart-unit_0_5_3" = callPackage
+  "chart-unit_0_5_4" = callPackage
     ({ mkDerivation, base, colour, containers, data-default
-     , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl
-     , formatting, lens, linear, mwc-probability, mwc-random, numhask
-     , numhask-range, palette, primitive, protolude, SVGFonts, tasty
-     , tasty-hspec, tdigest, text
+     , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear
+     , mwc-probability, mwc-random, numhask, numhask-range, palette
+     , primitive, protolude, SVGFonts, tasty, tasty-hspec, tdigest, text
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.5.3";
-       sha256 = "0kr57pv63xlx2xnc0cj0da1bc5cf8icnw81lbndrdxh126si50k5";
+       version = "0.5.4";
+       sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42037,9 +42072,8 @@ self: {
          lens linear numhask numhask-range palette SVGFonts text
        ];
        executableHaskellDepends = [
-         base containers diagrams-lib diagrams-rasterific diagrams-svg foldl
-         formatting lens mwc-probability mwc-random numhask primitive
-         protolude tdigest text
+         base containers diagrams-lib diagrams-svg foldl formatting lens
+         mwc-probability mwc-random numhask primitive protolude tdigest text
        ];
        testHaskellDepends = [ base numhask tasty tasty-hspec text ];
        homepage = "https://github.com/tonyday567/chart-unit";
@@ -42348,22 +42382,22 @@ self: {
     ({ mkDerivation, base, bytestring, containers, diff-parse
      , directory, file-embed, filepath, github, hlint, hspec
      , hspec-megaparsec, interpolatedstring-perl6, megaparsec
-     , monad-parallel, optparse-applicative, QuickCheck, quickcheck-text
-     , range, temporary, text
+     , monad-parallel, optparse-applicative, process, QuickCheck
+     , quickcheck-text, range, temporary, text
      }:
      mkDerivation {
        pname = "checkmate";
-       version = "0.2.1";
-       sha256 = "0ks073hppsafbg4cy021yc6pnp0p5gm15qr1067a0w0sny5z81z3";
+       version = "0.3.0";
+       sha256 = "0yqinjpc65flh50kb2jax10lrmcbp8lcy36ivrya180wdfvlcm0n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers diff-parse directory filepath megaparsec
+         base containers diff-parse directory filepath github megaparsec
          monad-parallel range text
        ];
        executableHaskellDepends = [
-         base diff-parse directory filepath github megaparsec
-         optparse-applicative range text
+         base diff-parse directory filepath megaparsec optparse-applicative
+         process range text
        ];
        testHaskellDepends = [
          base bytestring diff-parse directory file-embed filepath hlint
@@ -47934,6 +47968,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_2_0" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, criterion, directory, exceptions
+     , filepath, hspec, monad-control, network, primitive, process
+     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.2.0";
+       sha256 = "0f13r6ypch3px7qfh6a2qj2y5yhdzwy53v0f6bxyc9xl0hxf49yq";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit directory exceptions hspec process QuickCheck resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder conduit criterion
+         transformers
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -52638,8 +52703,8 @@ self: {
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "currencies";
-       version = "0.1.1.0";
-       sha256 = "07mkzn12rwlgfv7l0b507sqhl2hw56clmj6sfj0cmdyq9i75lj55";
+       version = "0.1.1.1";
+       sha256 = "1w0b7wp3kz8iqm25s28w131g923pysp9s1p7ll7df5wr64fh53nm";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/alx741/currencies#readme";
@@ -59526,10 +59591,8 @@ self: {
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.2.1";
-       sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl";
-       revision = "3";
-       editedCabalFile = "1g0dixgjmdc1hr7b9w57rm7agp3419bd2akv9wysghmsvf3j7893";
+       version = "0.3";
+       sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          primitive profunctors promises semigroups transformers
@@ -59608,10 +59671,8 @@ self: {
      }:
      mkDerivation {
        pname = "diskhash";
-       version = "0.0.1.2";
-       sha256 = "10fmh48xndy3bs1aphm9y9rh8lax4spyysr675d69gabhxm3qcvb";
-       revision = "1";
-       editedCabalFile = "10kck6rz2x0c0vnzr916qy9ss5aq6fr2jq7c8mpking3668j3ann";
+       version = "0.0.2.1";
+       sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring directory HUnit QuickCheck test-framework
@@ -60904,6 +60965,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "doctemplates_0_2_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, hspec, parsec, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "doctemplates";
+       version = "0.2.1";
+       sha256 = "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers parsec
+         scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec text ];
+       homepage = "https://github.com/jgm/doctemplates#readme";
+       description = "Pandoc-style document templates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
@@ -62868,6 +62950,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eap" = callPackage
+    ({ mkDerivation, base, binary, bytestring }:
+     mkDerivation {
+       pname = "eap";
+       version = "0.1.0.0";
+       sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir";
+       libraryHaskellDepends = [ base binary bytestring ];
+       homepage = "https://github.com/erickg/eap#readme";
+       description = "Extensible Authentication Protocol (EAP)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "earclipper" = callPackage
     ({ mkDerivation, base, filepath, hspec }:
      mkDerivation {
@@ -63742,6 +63836,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "either_4_5" = callPackage
+    ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
+     , monad-control, MonadRandom, mtl, profunctors, semigroupoids
+     , semigroups, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "either";
+       version = "4.5";
+       sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc";
+       libraryHaskellDepends = [
+         base bifunctors exceptions free mmorph monad-control MonadRandom
+         mtl profunctors semigroupoids semigroups transformers
+         transformers-base
+       ];
+       homepage = "http://github.com/ekmett/either/";
+       description = "An either monad transformer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "either-list-functions" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -63835,22 +63949,17 @@ self: {
      }) {};
 
   "ekg-cloudwatch" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-cloudwatch
-     , amazonka-core, base, bytestring, ekg-core, hspec, lens, resourcet
-     , semigroups, text, time, unordered-containers
+    ({ mkDerivation, amazonka, amazonka-cloudwatch, amazonka-core, base
+     , bytestring, ekg-core, lens, resourcet, semigroups, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ekg-cloudwatch";
-       version = "0.0.1.5";
-       sha256 = "1k3g6rq0kpslyqajcmw7cymd0pq89kfklpfs59kc4ksv27569zfm";
+       version = "0.0.1.6";
+       sha256 = "038l510n8h1v97j6wqyrlmrz7i7hwyllj4nvw2m3ccrvbfpdky59";
        libraryHaskellDepends = [
-         aeson amazonka amazonka-cloudwatch amazonka-core base bytestring
-         ekg-core lens resourcet semigroups text time unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson amazonka amazonka-cloudwatch amazonka-core base bytestring
-         ekg-core hspec lens resourcet semigroups text time
-         unordered-containers
+         amazonka amazonka-cloudwatch amazonka-core base bytestring ekg-core
+         lens resourcet semigroups text time unordered-containers
        ];
        homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme";
        description = "An ekg backend for Amazon Cloudwatch";
@@ -71721,8 +71830,8 @@ self: {
      }:
      mkDerivation {
        pname = "fluid-idl";
-       version = "0.0.0";
-       sha256 = "1j1j0sr9sw0ksdjcpcyf6w89drszqd3848lv7hb5rjp59aapnpv8";
+       version = "0.0.1";
+       sha256 = "1mqswhsvyycxa7c7c92jag6rsp0dbkdm8bwjv6pcr92w293ycrv2";
        libraryHaskellDepends = [
          aeson base bytestring containers errors exceptions lifted-async
          monad-control monad-logger mtl random safe-exceptions scientific
@@ -71752,6 +71861,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fluid-idl-scotty" = callPackage
+    ({ mkDerivation, aeson, base, fluid-idl, mtl, scotty, text, wai }:
+     mkDerivation {
+       pname = "fluid-idl-scotty";
+       version = "0.0.0";
+       sha256 = "11wi8qgw7i7m6ilcmmjk2ynvi66h8pcr83kbyi9vji3s6js2szf4";
+       libraryHaskellDepends = [
+         aeson base fluid-idl mtl scotty text wai
+       ];
+       description = "Scotty server add-on for Fluid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fluidsynth" = callPackage
     ({ mkDerivation, base, bindings-DSL, containers, directory
      , fluidsynth
@@ -71965,7 +72087,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_3_2" = callPackage
+  "foldl_1_3_3" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
      , profunctors, semigroups, text, transformers, unordered-containers
@@ -71973,8 +72095,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.3.2";
-       sha256 = "1z3xjz4khs2kr3mqkbh7dz4kd6gkdk2r67wjkvrxnmp533aqh90n";
+       version = "1.3.3";
+       sha256 = "18gzis64sa7ifclaz3n10j2lkh4ikvbakrkz2kkipjddafidvsr3";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroups text transformers
@@ -73353,6 +73475,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "freelude" = callPackage
+    ({ mkDerivation, array, base, containers, doctest, indextype
+     , transformers
+     }:
+     mkDerivation {
+       pname = "freelude";
+       version = "0.1.0.1";
+       sha256 = "0a16vbm17dvvfk9wp8y9df8qypy14vld4yq20hh273p2cdxx5p2n";
+       libraryHaskellDepends = [
+         array base containers indextype transformers
+       ];
+       testHaskellDepends = [
+         array base containers doctest indextype transformers
+       ];
+       homepage = "https://github.com/clintonmead/freelude#readme";
+       description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "freenect" = callPackage
     ({ mkDerivation, base, freenect, freenect_sync, libfreenect, vector
      }:
@@ -77503,6 +77644,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_5_5" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
+     , tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.5.5";
+       sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra integer-gmp
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-presburger" = callPackage
     ({ mkDerivation, base, equational-reasoning, ghc
      , ghc-tcplugins-extra, presburger, reflection
@@ -78833,23 +78992,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ginger_0_7_1_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
-     , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , utf8-string, vector
+  "ginger_0_7_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+     , data-default, filepath, http-types, mtl, parsec, safe, scientific
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.7.1.0";
-       sha256 = "0022qv80dkjns825361laaksccay56q6zmcrbhjrc4j25nys29n8";
+       version = "0.7.2.0";
+       sha256 = "1xgczxqqd4ml8ifcyr45nrgbqn5a40nrbkvzbn4r4djpivnsrk0k";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring data-default filepath http-types mtl parsec
-         safe scientific text time transformers unordered-containers
-         utf8-string vector
+         aeson aeson-pretty base bytestring data-default filepath http-types
+         mtl parsec safe scientific text time transformers
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson base bytestring data-default text transformers
@@ -79045,8 +79204,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20171003";
-       sha256 = "0fyyad5fbdacwyg8b1m6fp1qqkdhp1hgp5r1isivmxfbk15xgvai";
+       version = "6.20171018";
+       sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -79484,6 +79643,8 @@ self: {
        pname = "github";
        version = "0.17.0";
        sha256 = "1w9r40c2wjzlc503g30br6dwq213b2q6qap4r1nlk13z9r57c9mk";
+       revision = "1";
+       editedCabalFile = "183a17k7mgnq7x7pc9hg51692vq0n8v7qp9s5rvzkbdk4gl4kcn8";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -79570,6 +79731,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_0_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.0.7";
+       sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -80037,8 +80220,8 @@ self: {
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.3.2";
-       sha256 = "0zyv16gyfjq9mz826zq9q5kqz73y7cp7cbz2cbvb11adbci4pj1r";
+       version = "0.3.3";
+       sha256 = "10g1daxf29vdm62l5fyah3lh7sh9q00yvv3xa7wpzhnm6k2liadn";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -83778,15 +83961,16 @@ self: {
   "graphite" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, criterion
      , deepseq, graphviz, hashable, hspec, process, QuickCheck, random
-     , unordered-containers, vector
+     , semigroups, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.9.0.0";
-       sha256 = "0s252k5syfkvrvg7amabkzmlvcr4ms2cv1ykli55gfslyzi7809n";
+       version = "0.9.5.1";
+       sha256 = "0sb8ixz91bcyzylhjk7d44c62gcl1xkfc5vc60sx1z0944f06l1h";
        libraryHaskellDepends = [
          base bytestring cassava containers deepseq graphviz hashable
-         process QuickCheck random unordered-containers vector
+         process QuickCheck random semigroups text unordered-containers
+         vector
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -86737,6 +86921,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hackernews_1_3_0_0" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
+     , http-types, QuickCheck, quickcheck-instances, servant
+     , servant-client, string-conversions, text
+     }:
+     mkDerivation {
+       pname = "hackernews";
+       version = "1.3.0.0";
+       sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base http-client http-types QuickCheck quickcheck-instances
+         servant servant-client string-conversions text
+       ];
+       executableHaskellDepends = [ base http-client http-client-tls ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-client-tls QuickCheck
+         quickcheck-instances
+       ];
+       description = "API for Hacker News";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hackertyper" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -87304,6 +87513,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.6";
+       sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -89743,6 +89972,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hash-tree" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, containers
+     , cryptonite, hspec, memory, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hash-tree";
+       version = "0.0.0";
+       sha256 = "0nxnjpwd6cw5m064jmgylscxfc5xhhm0abzdknprasmh6ln4525j";
+       libraryHaskellDepends = [
+         base bytestring containers cryptonite memory
+       ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers cryptonite hspec
+         memory QuickCheck
+       ];
+       description = "Merkle Hash Tree";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hashable" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
      , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
@@ -93228,6 +93476,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasmin_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
+     , hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "1.0";
+       sha256 = "1a512s1fd472agy2pv9qizp61jrz1jzdpxla3213y6wsahi9wdnm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers matrix mtl numbers parsers
+         text
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers gitrev hopfli matrix mtl
+         numbers optparse-applicative parsers text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
+       homepage = "https://github.com/contivero/hasmin#readme";
+       description = "CSS Minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -93458,18 +93737,6 @@ self: {
      }) {};
 
   "hasql-pool" = callPackage
-    ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
-     mkDerivation {
-       pname = "hasql-pool";
-       version = "0.4.1";
-       sha256 = "03f6g6bnp7ipfdy01grnzcl3z9zsvn4ahv64cfdn16c911ddsvyc";
-       libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
-       homepage = "https://github.com/nikita-volkov/hasql-pool";
-       description = "A pool of connections for Hasql";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql-pool_0_4_2_1" = callPackage
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
@@ -93479,7 +93746,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -95296,8 +95562,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.9.9";
-       sha256 = "1va4lk0pjf3hcw4ap3s35c1slpbrb898g9x01az7g1xgwxq4y2jl";
+       version = "0.9.10";
+       sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq mtl network
          resource-pool scanner stm text time unordered-containers vector
@@ -95312,6 +95578,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_9_11" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, HUnit, mtl, network, resource-pool, scanner
+     , slave-thread, stm, test-framework, test-framework-hunit, text
+     , time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.9.11";
+       sha256 = "1ya5jpf57zs66hqvr58xyj0k7jq5cmdci1yxzwj19cag1wfq47rb";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq mtl network
+         resource-pool scanner stm text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring HUnit mtl slave-thread stm test-framework
+         test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -96065,6 +96356,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "herms" = callPackage
+    ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
+     , microlens-th, optparse-applicative, semigroups, split, vty
+     }:
+     mkDerivation {
+       pname = "herms";
+       version = "1.8.1.2";
+       sha256 = "1avyf8xz4wkv6xijg3wrj0398wy5jcwlp50iil1z8jdlfwh72f18";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         ansi-terminal base brick directory microlens microlens-th
+         optparse-applicative semigroups split vty
+       ];
+       homepage = "https://github.com/JackKiefer/herms";
+       description = "A command-line manager for delicious kitchen recipes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hero-club-five-tenets" = callPackage
     ({ mkDerivation, base, random, text }:
      mkDerivation {
@@ -97775,8 +98086,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.3";
-       sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk";
+       version = "5.2.4.1";
+       sha256 = "0m35gd2r49cnaxsn9k82g8arj5pz66glsijlji2g77psd9a3flff";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -101871,7 +102182,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpio_0_9_0_0" = callPackage
+  "hpio_0_9_0_2" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , doctest, exceptions, filepath, hlint, hspec, monad-control
      , monad-logger, mtl, optparse-applicative, protolude, QuickCheck
@@ -101879,8 +102190,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpio";
-       version = "0.9.0.0";
-       sha256 = "1j69y396k08af6pvxj0l1687fdfknsyv3xhy7lhhibglv6nskg48";
+       version = "0.9.0.2";
+       sha256 = "0jxmmch6y897rk02rql4rs82qmdj3r3xpbsrv75sgc2mb09cx2zy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104444,15 +104755,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
-  "hslua_0_9_1" = callPackage
+  "hslua_0_9_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, fail
      , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty
      , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.9.1";
-       sha256 = "037w7s0fjji54wa5hl8rarf4c655ybzw4p1jzfy41k6qhwnk4i5i";
+       version = "0.9.2";
+       sha256 = "1n1fw2ak3xk4llv3d3bbpcayjd6h2a83n06i96m2k30lzanbg0ys";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -107720,6 +108031,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-types_0_10" = callPackage
+    ({ mkDerivation, array, base, blaze-builder, bytestring
+     , case-insensitive, doctest, hspec, QuickCheck
+     , quickcheck-instances, text
+     }:
+     mkDerivation {
+       pname = "http-types";
+       version = "0.10";
+       sha256 = "1bim98ax7yqhwmq7d5zr7ii5vkx9xjsdqp6wm2ww56lzry1d8i1q";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring case-insensitive text
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring doctest hspec QuickCheck
+         quickcheck-instances text
+       ];
+       homepage = "https://github.com/aristidb/http-types";
+       description = "Generic HTTP types for Haskell (for both client and server code)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-wget" = callPackage
     ({ mkDerivation, base, failure, process, transformers }:
      mkDerivation {
@@ -112269,8 +112602,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "indextype";
-       version = "0.3.0.0";
-       sha256 = "06z4976dy45xyg511bw3nfsfa2lb7m0b081lqpw8q3gmfgrwm66f";
+       version = "0.3.0.1";
+       sha256 = "1v2jly7sn54bfz0swa9835l15f8r78zj6wqd8kavzwx00ini443i";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
@@ -114004,19 +114337,21 @@ self: {
 
   "ip" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , doctest, hashable, HUnit, primitive, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
+     , doctest, hashable, HUnit, primitive, QuickCheck
+     , quickcheck-classes, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, vector
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.9.3";
-       sha256 = "0r8kxdxh08plmal9q2i098hlgxvii67ylprzwqzrwa1i9qlcv7v6";
+       version = "1.1.0";
+       sha256 = "0a5dc019jmkx77kk3jmgvk79ffigam38fanjwajaqsxy5ysp5xyf";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring doctest HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text
+         attoparsec base bytestring doctest HUnit QuickCheck
+         quickcheck-classes test-framework test-framework-hunit
+         test-framework-quickcheck2 text
        ];
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion text
@@ -115769,23 +116104,6 @@ self: {
      }) {};
 
   "javascript-extras" = callPackage
-    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
-     mkDerivation {
-       pname = "javascript-extras";
-       version = "0.3.1.0";
-       sha256 = "05y7343ybgbaydckgssb22c789bawvk6x95vbrarzf3m5brlgw7a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base deepseq ghcjs-base-stub parallel text
-       ];
-       executableHaskellDepends = [ base ghcjs-base-stub ];
-       homepage = "https://github.com/louispan/javascript-extras#readme";
-       description = "Extra javascript functions when using GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "javascript-extras_0_3_2_0" = callPackage
     ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
      mkDerivation {
        pname = "javascript-extras";
@@ -115800,7 +116118,6 @@ self: {
        homepage = "https://github.com/louispan/javascript-extras#readme";
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -118124,8 +118441,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.0.3";
-       sha256 = "18gpj6h9h90nvpb0fb1ns2ygzip4r0v7hna4q1d6gmz88j28s66a";
+       version = "0.5.1.0";
+       sha256 = "1jcvjia4r6x2fwsyq0f038y63fr673r2jh4gm1xfn6qxis7im68n";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -118148,43 +118465,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katip_0_5_0_4" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , bytestring, containers, criterion, deepseq, directory, either
-     , filepath, hostname, microlens, microlens-th, monad-control, mtl
-     , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , safe-exceptions, scientific, semigroups, stm, string-conv, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, time, time-locale-compat, transformers, transformers-base
-     , transformers-compat, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "katip";
-       version = "0.5.0.4";
-       sha256 = "1plxvljhcpdws78fx36v2wn2s7vzbmf1h7rq00yf9680fvcyaq8y";
-       libraryHaskellDepends = [
-         aeson async auto-update base bytestring containers either hostname
-         microlens microlens-th monad-control mtl old-locale resourcet
-         safe-exceptions scientific semigroups stm string-conv
-         template-haskell text time transformers transformers-base
-         transformers-compat unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory microlens
-         quickcheck-instances regex-tdfa safe-exceptions stm tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         time time-locale-compat unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq directory filepath
-         safe-exceptions text time transformers unix
-       ];
-       homepage = "https://github.com/Soostone/katip";
-       description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, bytestring
      , containers, criterion, deepseq, enclosed-exceptions, exceptions
@@ -118217,6 +118497,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-syslog" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hsyslog, katip
+     , string-conv, text
+     }:
+     mkDerivation {
+       pname = "katip-syslog";
+       version = "0.1.0.0";
+       sha256 = "0fj6c0rzs2v5ng3gsc9qlk5ksszh2dpmi378ydxxcrjjzkz3ng6c";
+       libraryHaskellDepends = [
+         aeson base bytestring hsyslog katip string-conv text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/iconnect/katip-syslog#readme";
+       description = "Syslog Katip Scribe";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -126466,6 +126763,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "localize" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , directory, filepath, Glob, haskell-gettext, mtl, setlocale, text
+     , text-format-heavy, time, transformers
+     }:
+     mkDerivation {
+       pname = "localize";
+       version = "0.2.0.0";
+       sha256 = "1c0y3blyr36qrbqwnrb802h7nl6m3qzch4ivzajjan9xj5cbbswh";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default directory filepath
+         Glob haskell-gettext mtl setlocale text text-format-heavy time
+         transformers
+       ];
+       description = "GNU Gettext-based messages localization library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "located" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -126690,6 +127005,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-domain_0_12" = callPackage
+    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+     , comonad, deepseq, distributive, doctest, generic-deriving
+     , hashable, semigroupoids, semigroups, simple-reflect, vector
+     }:
+     mkDerivation {
+       pname = "log-domain";
+       version = "0.12";
+       sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary bytes cereal comonad deepseq distributive hashable
+         semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/ekmett/log-domain/";
+       description = "Log-domain arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
      , time
@@ -126786,8 +127124,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.3.3";
-       sha256 = "1r7x9fsnaqzs7d3a5kvbaqyhvha8yddb6z5856bqcfk3wflqpcas";
+       version = "1.4.0";
+       sha256 = "07yb19bwx8n697fird3952nn1a9d4cqbf8wcxmlji41brznhgbkz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128255,10 +128593,8 @@ self: {
      }:
      mkDerivation {
        pname = "lxd-client-config";
-       version = "0.1.0.0";
-       sha256 = "0cvjfdi2dkysprqy4975x6nxpmk6ppwr8i345hqjwrcahz7hv6i8";
-       revision = "1";
-       editedCabalFile = "0i2fpnvdnld5qpybf7szcanvrla917rfak0r7fk1wk4yk09lsyl4";
+       version = "0.1.0.1";
+       sha256 = "1kxg42hrgq5w38v1zsq8v9x0ky83c02k8rx2qcyazh7bkg4m4f4h";
        libraryHaskellDepends = [
          aeson base containers directory filepath text yaml
        ];
@@ -128764,8 +129100,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.4.2.22";
-       sha256 = "1wg2lph25s0lz4ac1jvzy8vsizkyr7pcdq2cc8wxjj2z7f5k2yia";
+       version = "3.0.0.1";
+       sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory file-embed process ];
@@ -134299,8 +134635,8 @@ self: {
        pname = "monad-http";
        version = "0.1.0.0";
        sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3";
-       revision = "5";
-       editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg";
+       revision = "6";
+       editedCabalFile = "0xnh69yfpgz1i43x2695gyrxar1582m02cwrzmvfymzvvqbkcwld";
        libraryHaskellDepends = [
          base base-compat bytestring exceptions http-client http-client-tls
          http-types monad-logger monadcryptorandom MonadRandom mtl text
@@ -134340,6 +134676,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-journal_0_8_0" = callPackage
+    ({ mkDerivation, base, either, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-journal";
+       version = "0.8.0";
+       sha256 = "0l78flvvvhpk2zcb39ax0qjqpidi8ydnc3ipnh4vy63c8w02w39n";
+       libraryHaskellDepends = [
+         base either monad-control mtl transformers transformers-base
+       ];
+       homepage = "http://github.com/phaazon/monad-journal";
+       description = "Pure logger typeclass and monad transformer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-levels" = callPackage
     ({ mkDerivation, base, constraints, transformers
      , transformers-compat
@@ -137901,14 +138254,21 @@ self: {
      }) {};
 
   "mxnet" = callPackage
-    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
+    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet, pretty, tasty
+     , tasty-hunit, template-haskell, unordered-containers, vector
+     }:
      mkDerivation {
        pname = "mxnet";
-       version = "0.1.0.1";
-       sha256 = "03migg97ly6ld2w1nszz7rmirr0adfhsj75678mlf3rzxf5zh1wl";
-       libraryHaskellDepends = [ base c2hs-extra ];
+       version = "0.2.0.0";
+       sha256 = "05zz149gzsvchllwwn659kqissj6ymdi7kdjx5d7mx7liabf04ij";
+       revision = "1";
+       editedCabalFile = "0z8kjn1808k5pdrgx0mncppzzv5hw01r7h8s54iv8kz57qfqhcpm";
+       libraryHaskellDepends = [
+         base c2hs-extra pretty template-haskell unordered-containers vector
+       ];
        librarySystemDepends = [ mxnet ];
        libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base tasty tasty-hunit vector ];
        homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -137919,8 +138279,8 @@ self: {
     ({ mkDerivation, base, mxnet }:
      mkDerivation {
        pname = "mxnet-examples";
-       version = "0.1.0.0";
-       sha256 = "1gzpx33v0xaarpyl4v5x9ydacnc3p4xcxcwj2b8rsh4vzmsv2z0l";
+       version = "0.2.0.0";
+       sha256 = "0mxwn6wcwiv0z618rffws2z59l5yh929lxwlhgyifzw3sm0h1kxw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mxnet ];
@@ -138189,8 +138549,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.3";
-       sha256 = "12zryyrjkrglp0r8ra3kcmyksq8g864c5nfxa5d7w3rn9532lzjj";
+       version = "0.4.4";
+       sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
@@ -141257,15 +141617,18 @@ self: {
 
   "nix-derivation" = callPackage
     ({ mkDerivation, attoparsec, base, containers, criterion, deepseq
-     , QuickCheck, system-filepath, text, vector
+     , pretty-show, QuickCheck, system-filepath, text, vector
      }:
      mkDerivation {
        pname = "nix-derivation";
-       version = "1.0.0";
-       sha256 = "1qx37nk5fg7kqvy9pfvf1jhn9cyr8rkfgz4hm3xy8m92l0rprfw4";
+       version = "1.0.1";
+       sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers deepseq system-filepath text vector
        ];
+       executableHaskellDepends = [ attoparsec base pretty-show text ];
        testHaskellDepends = [
          attoparsec base QuickCheck system-filepath text vector
        ];
@@ -143024,6 +143387,8 @@ self: {
        pname = "objective";
        version = "1.1.1";
        sha256 = "0d36v2w8f9g68zh2cdf8hnkzdafv0z6np895ak610n8bkxvqxlbs";
+       revision = "1";
+       editedCabalFile = "0p1w5zabfqqksyxxv880f6d27rl2vx9101vvflkxwhyfw0az6zin";
        libraryHaskellDepends = [
          base containers either exceptions free hashable monad-skeleton mtl
          profunctors template-haskell transformers transformers-compat
@@ -145793,6 +146158,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packer-messagepack" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hedgehog, packer
+     , safe-exceptions, text, unliftio
+     }:
+     mkDerivation {
+       pname = "packer-messagepack";
+       version = "0.2.0.0";
+       sha256 = "1alilaj2gk7pwdl7cpds7s0b35w9dnrbrff55sqdx2n1dyrxn62h";
+       libraryHaskellDepends = [
+         base bytestring containers packer safe-exceptions text unliftio
+       ];
+       testHaskellDepends = [
+         base bytestring containers hedgehog packer safe-exceptions text
+       ];
+       homepage = "https://github.com/mtesseract/packer-messagepack#readme";
+       description = "MessagePack Serialization an Deserialization for Packer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "packman" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, directory
      , ghc-prim, primitive, QuickCheck
@@ -147828,28 +148212,39 @@ self: {
      }) {};
 
   "partial-semigroup" = callPackage
-    ({ mkDerivation, base, doctest, hedgehog, partial-semigroup-test }:
+    ({ mkDerivation, base, hedgehog }:
      mkDerivation {
        pname = "partial-semigroup";
-       version = "0.1.0.1";
-       sha256 = "1bkm2hsngw8z77zsgxlrqdfzh8hk0hbsr42cjc4c8v84npr1lh7f";
+       version = "0.2.0.1";
+       sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base doctest hedgehog partial-semigroup-test
-       ];
-       homepage = "https://github.com/chris-martin/partial-semigroup#readme";
+       testHaskellDepends = [ base hedgehog ];
+       homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "partial-semigroup-test" = callPackage
+  "partial-semigroup-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, partial-semigroup }:
      mkDerivation {
-       pname = "partial-semigroup-test";
-       version = "0.1.0.1";
-       sha256 = "1346056kzswfa3bakhfh24y07a2sj2qa5cq5npzf01n99x08jvgz";
+       pname = "partial-semigroup-hedgehog";
+       version = "0.2.0.1";
+       sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
-       homepage = "https://github.com/chris-martin/partial-semigroup#readme";
+       homepage = "https://github.com/chris-martin/partial-semigroup";
+       description = "Property testing for partial semigroups using Hedgehog";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "partial-semigroup-test" = callPackage
+    ({ mkDerivation, partial-semigroup-hedgehog }:
+     mkDerivation {
+       pname = "partial-semigroup-test";
+       version = "0.2.0.1";
+       sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4";
+       libraryHaskellDepends = [ partial-semigroup-hedgehog ];
+       doHaddock = false;
+       homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -149412,6 +149807,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_6_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , product-isomorphic, quickcheck-simple, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.6.0.0";
+       sha256 = "097h8hx0si5mbi7c8l0mnwwzj166hn2vlfpgkkys17jxr8h6h31x";
+       libraryHaskellDepends = [
+         array base containers dlist names-th product-isomorphic
+         template-haskell th-data-compat transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Binding between SQL database values and haskell records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistable-types-HDBC-pg" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC
      , persistable-record, relational-query-HDBC, text-postgresql
@@ -149664,7 +150079,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "persistent-mysql-haskell_0_3_4" = callPackage
+  "persistent-mysql-haskell_0_3_4_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-control, monad-logger, mysql-haskell, network
      , persistent, persistent-template, resource-pool, resourcet, text
@@ -149672,8 +150087,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.3.4";
-       sha256 = "1g1i71zpnwbngw56fn7in06k79v4pa5lcq4vk606p8aqyhf4xgfp";
+       version = "0.3.4.1";
+       sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149867,32 +150282,6 @@ self: {
      }) {};
 
   "persistent-template" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.5.2";
-       sha256 = "04a0ifjidy7lv5ip0dipjgsvr3h9kkw37z03s5kaxyaqh405nsfy";
-       revision = "1";
-       editedCabalFile = "0jhcanaz680knzc45g594fa68ihh7mkkrhlyaxnj6rjwbrcwjp9x";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_5_3" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -149913,7 +150302,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -150881,6 +151269,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.6";
+       sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -151004,8 +151419,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.3.5";
-       sha256 = "1s158p7d14lxk34yh7x0b44g3m57pq096p6k0fg19g7jkl8jcd7p";
+       version = "4.3.6";
+       sha256 = "0nwap7bjwv6q0jis1j452r1zgfl4pfdip4lzs047r8zh75cvc5h8";
        libraryHaskellDepends = [
          base exceptions mmorph mtl semigroups transformers void
        ];
@@ -151448,8 +151863,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.11";
-       sha256 = "0hllsd5jk88fv59bqiqksk52iwmqm7835fchzqmavgdsrib0nlmi";
+       version = "1.0.12";
+       sha256 = "0sr7n0p8nwsyp52dybq3lgswz353jc239hysqlxhlsa4hh1l5q61";
        libraryHaskellDepends = [ base foldl lens pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -154606,23 +155021,23 @@ self: {
     ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base
      , base64-bytestring, bytestring, configurator, containers
      , contravariant, either, hasql, hasql-pool, heredoc, hspec
-     , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson
-     , optparse-applicative, postgresql-libpq, protolude, retry, stm
-     , stm-containers, stringsearch, text, time, transformers, unix
-     , unordered-containers, wai, wai-app-static, wai-extra
-     , wai-websockets, warp, websockets
+     , hspec-wai, hspec-wai-json, http-types, jose, jwt, lens
+     , lens-aeson, optparse-applicative, postgresql-libpq, protolude
+     , retry, stm, stm-containers, stringsearch, text, time
+     , transformers, unix, unordered-containers, wai, wai-app-static
+     , wai-extra, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.4.0.0";
-       sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6";
+       version = "0.4.1.0";
+       sha256 = "0i1bri8a0k7x9m47736ykdq46xpx0hhy8lp3qz1b1xfswmj3hhjg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring contravariant either hasql hasql-pool
-         http-types jwt lens lens-aeson postgresql-libpq protolude retry stm
-         stm-containers stringsearch text time unordered-containers wai
-         wai-websockets websockets
+         http-types jose jwt lens lens-aeson postgresql-libpq protolude
+         retry stm stm-containers stringsearch text time
+         unordered-containers wai wai-websockets websockets
        ];
        executableHaskellDepends = [
          ansi-wl-pprint auto-update base base64-bytestring bytestring
@@ -154632,7 +155047,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson base containers hasql hasql-pool hspec hspec-wai
-         hspec-wai-json http-types protolude stm wai-extra
+         hspec-wai-json http-types protolude stm unordered-containers
+         wai-extra
        ];
        homepage = "https://github.com/diogob/postgrest-ws#readme";
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
@@ -155606,8 +156022,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "2.0.0.0";
-       sha256 = "1gkghnp3fpcksfkvxsvg3979499y7vb73qp8fgvs7fv2m5rzqjz6";
+       version = "2.0.1.0";
+       sha256 = "0a72kns4ydh22q1kwbljknrbgcpvh9l4jx16fm2s3hkkw9fivl27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158430,8 +158846,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.11.0.0";
-       sha256 = "0y2qli86ac12xr54vxdfqa3wadxajn6s266y9vpd7lahsnhjwkvf";
+       version = "0.11.1.0";
+       sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -159094,8 +159510,8 @@ self: {
      }:
      mkDerivation {
        pname = "qm-interpolated-string";
-       version = "0.1.1.0";
-       sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1";
+       version = "0.2.1.0";
+       sha256 = "09qzlhrzhv0hcc7m8qwfh64nprf3wq4x9lrcdnqpqw2airh5cbn3";
        libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
@@ -159610,6 +160026,21 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "quickcheck-classes" = callPackage
+    ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-classes";
+       version = "0.1";
+       sha256 = "0fjr4fagl9wblw6998675pljhgwr554kxfahpjfk46kiknghqic1";
+       libraryHaskellDepends = [
+         aeson base prim-array primitive QuickCheck
+       ];
+       testHaskellDepends = [ aeson base primitive QuickCheck ];
+       homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
+       description = "QuickCheck common typeclasses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quickcheck-combinators" = callPackage
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
@@ -160463,6 +160894,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "radius" = callPackage
+    ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }:
+     mkDerivation {
+       pname = "radius";
+       version = "0.2.0.0";
+       sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy";
+       libraryHaskellDepends = [
+         base binary bytestring iproute pretty-hex
+       ];
+       homepage = "https://github.com/erickg/radius#readme";
+       description = "Remote Authentication Dial In User Service (RADIUS)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "radix" = callPackage
     ({ mkDerivation, base, filepath }:
      mkDerivation {
@@ -161561,6 +162006,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, http-client, http-client-tls, http-types
+     , tasty, tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.6";
+       sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base filepath tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -162144,18 +162609,19 @@ self: {
   "reactive-balsa" = callPackage
     ({ mkDerivation, alsa-core, alsa-seq, base, containers
      , data-accessor, data-accessor-transformers, event-list
-     , extensible-exceptions, midi, midi-alsa, non-negative, random
-     , reactive-banana, reactive-midyim, transformers, utility-ht
+     , extensible-exceptions, midi, midi-alsa, non-empty, non-negative
+     , random, reactive-banana-bunch, reactive-midyim, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "reactive-balsa";
-       version = "0.3";
-       sha256 = "1h7whcms8idfgpz1x645b725a598ppxhdb72sx2s84r64vn8ila0";
+       version = "0.4";
+       sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h";
        libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
-         midi-alsa non-negative random reactive-banana reactive-midyim
-         transformers utility-ht
+         midi-alsa non-empty non-negative random reactive-banana-bunch
+         reactive-midyim transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
@@ -162185,6 +162651,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reactive-banana-bunch" = callPackage
+    ({ mkDerivation, base, non-empty, reactive-banana, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "reactive-banana-bunch";
+       version = "1.0";
+       sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn";
+       libraryHaskellDepends = [
+         base non-empty reactive-banana transformers utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/reactive-banana-bunch/";
+       description = "Extend reactive-banana to multiple events per time point";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reactive-banana-gi-gtk" = callPackage
     ({ mkDerivation, base, gi-gtk, haskell-gi-base, reactive-banana
      , text, transformers
@@ -162330,17 +162812,17 @@ self: {
   "reactive-jack" = callPackage
     ({ mkDerivation, base, containers, data-accessor, event-list
      , explicit-exception, extensible-exceptions, jack, midi
-     , non-negative, random, reactive-banana, reactive-midyim
+     , non-negative, random, reactive-banana-bunch, reactive-midyim
      , transformers, utility-ht
      }:
      mkDerivation {
        pname = "reactive-jack";
-       version = "0.3";
-       sha256 = "0p34s8kj17yy1sngicgzkc1jh17azj543jv7c8a5ks0jm7nrqjy9";
+       version = "0.4";
+       sha256 = "13j51qg9ph4vq5v4z94q8i5lfd8sr3v6ln1740g24v90j28gh87i";
        libraryHaskellDepends = [
          base containers data-accessor event-list explicit-exception
-         extensible-exceptions jack midi non-negative random reactive-banana
-         reactive-midyim transformers utility-ht
+         extensible-exceptions jack midi non-negative random
+         reactive-banana-bunch reactive-midyim transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
@@ -162351,15 +162833,16 @@ self: {
   "reactive-midyim" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , data-accessor-transformers, event-list, midi, non-negative
-     , random, reactive-banana, transformers, utility-ht
+     , random, reactive-banana-bunch, transformers, utility-ht
      }:
      mkDerivation {
        pname = "reactive-midyim";
-       version = "0.3";
-       sha256 = "09cgapzkggjl2drii3kv8yjhz0ck2cy5v8ikss9gyjaj0dljs7nx";
+       version = "0.4";
+       sha256 = "0aq3iaq3l4wcdixa09q9na2n4l92nkzikjbma3mxl4d6gklhcvhy";
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-transformers event-list
-         midi non-negative random reactive-banana transformers utility-ht
+         midi non-negative random reactive-banana-bunch transformers
+         utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
@@ -164684,6 +165167,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_10_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.10.0.0";
+       sha256 = "0a5gqfi0ns1gh1p2csv63m2b0psyq8dl3wzxrvj07p4gqq0m36gb";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
@@ -164704,6 +165211,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query-HDBC_0_6_5_0" = callPackage
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, product-isomorphic
+     , relational-query, relational-schemas, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query-HDBC";
+       version = "0.6.5.0";
+       sha256 = "0d609xbxxanvggv5lqf7lwfrzzmw6k46b212g5kv19p9v5bx6k7c";
+       libraryHaskellDepends = [
+         base containers convertible dlist HDBC HDBC-session names-th
+         persistable-record product-isomorphic relational-query
+         relational-schemas template-haskell th-data-compat transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record" = callPackage
     ({ mkDerivation, base, persistable-record
      , persistable-types-HDBC-pg, relational-query
@@ -164722,6 +165250,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_2_0_0" = callPackage
+    ({ mkDerivation, base, persistable-record
+     , persistable-types-HDBC-pg, product-isomorphic, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.2.0.0";
+       sha256 = "0qbkpli2bdzwpp13sqxsk8li6hczvs6k0yybrbgwyjdrqnha09d3";
+       libraryHaskellDepends = [
+         base persistable-record persistable-types-HDBC-pg
+         product-isomorphic relational-query relational-query-HDBC
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Meta package of Relational Record";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
@@ -164761,6 +165308,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-schemas_0_1_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, relational-query
+     , template-haskell, time
+     }:
+     mkDerivation {
+       pname = "relational-schemas";
+       version = "0.1.5.0";
+       sha256 = "0q76z6bcr27x2anqfgh7gkms7m2dk6xz0i7p0czcq64x2hy7cjnz";
+       libraryHaskellDepends = [
+         base bytestring containers relational-query template-haskell time
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "RDBMSs' schema templates for relational-query";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relative-date" = callPackage
     ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time
      }:
@@ -165848,6 +166412,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "resolv" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , containers, directory, filepath, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "resolv";
+       version = "0.1.1.0";
+       sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5";
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring containers
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath tasty tasty-hunit
+       ];
+       homepage = "http://github.com/hvr/resolv";
+       description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "resolve" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bv
      , bytestring, hashable, hashmap, hslogger, iproute, network, parsec
@@ -166048,6 +166631,8 @@ self: {
        pname = "rest-client";
        version = "0.5.1.1";
        sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x";
+       revision = "1";
+       editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx";
        libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-client http-conduit http-types hxt hxt-pickle-utils
@@ -166220,6 +166805,8 @@ self: {
        pname = "rest-wai";
        version = "0.2.0.1";
        sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q";
+       revision = "1";
+       editedCabalFile = "1j2n7bypgjajwsaahvp50cdwrl7y0nbv67bd3kfdq03yvz5s1py3";
        libraryHaskellDepends = [
          base base-compat bytestring case-insensitive containers http-types
          mime-types mtl rest-core text unordered-containers wai
@@ -167215,6 +167802,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rng-utils_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, random
+     , tasty, tasty-hedgehog
+     }:
+     mkDerivation {
+       pname = "rng-utils";
+       version = "0.3.0";
+       sha256 = "1fj6x5ihjsbw1cypdifccv2nkbx5gvax9aclypanlv5fw2qsr1h8";
+       libraryHaskellDepends = [ base bytestring random ];
+       testHaskellDepends = [
+         base bytestring hedgehog tasty tasty-hedgehog
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://bitbucket.org/soostone/rng-utils";
+       description = "RNG within an IORef for convenient concurrent use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "robin" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, fsnotify
      , hdaemonize, lens, lifted-base, monad-control, mtl, process
@@ -168980,6 +169586,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sajson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, criterion, hspec
+     , QuickCheck, scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "sajson";
+       version = "0.1.0.0";
+       sha256 = "0979skxh82s0q56smp8vlg0cj1k7qj1y37ivksl3spw9dspbpcs1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+       ];
+       executableHaskellDepends = [ aeson base bytestring criterion ];
+       testHaskellDepends = [
+         aeson base bytestring hspec QuickCheck scientific text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/kccqzy/haskell-sajson#readme";
+       description = "Fast JSON parsing powered by Chad Austin's sajson library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "saltine" = callPackage
     ({ mkDerivation, base, bytestring, libsodium, profunctors
      , QuickCheck, test-framework, test-framework-quickcheck2
@@ -169523,6 +170152,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "savage" = callPackage
+    ({ mkDerivation, base, random, tf-random }:
+     mkDerivation {
+       pname = "savage";
+       version = "1.0.0";
+       sha256 = "0njnj1191k90882k957kkgdmb5sfzakk79gmpsa0hvdkdx6fskaz";
+       libraryHaskellDepends = [ base random tf-random ];
+       homepage = "https://github.com/chessai/savage";
+       description = "Re-exported random generators from QuickCheck";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "say" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, temporary
      , text, transformers
@@ -170380,8 +171021,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9";
-       revision = "5";
-       editedCabalFile = "10p4hqsprxzh3j5w64xvbwv6lyc03r1d98mahbwyqs4ayz3ysxmf";
+       revision = "6";
+       editedCabalFile = "040jqfmaqy6g8hv903kjsd1bx4sr7pxsispj314gsdy8i7cb2n50";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -171756,8 +172397,8 @@ self: {
      }:
      mkDerivation {
        pname = "semiring-num";
-       version = "1.6.0.0";
-       sha256 = "0c12pg87y0ndpkmfpvl921495920fv4gx8i23hmvcq6nim9yy1ir";
+       version = "1.6.0.1";
+       sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi";
        libraryHaskellDepends = [
          base containers deepseq hashable log-domain scientific
          template-haskell time unordered-containers vector
@@ -173557,8 +174198,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.3.0";
-       sha256 = "1spqwfg1y0qajs5nl92gxif1qicgr4s8y0knkp9q76gvag1dyfng";
+       version = "0.0.3.1";
+       sha256 = "0ylpw1px56y08h6kl1dbn7xwwwv0abzk7llfs3dkjb9xmhh990ks";
        libraryHaskellDepends = [
          aeson base base-compat bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -173584,8 +174225,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-rawm";
-       version = "0.2.0.1";
-       sha256 = "1cd94qyv8qbsl6nab0nv7j10wjqa1q1fpsm7pxlp15wzvkp60kk2";
+       version = "0.2.0.2";
+       sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173891,6 +174532,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.3.1";
        sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78";
+       revision = "1";
+       editedCabalFile = "1bx68rcz4whjw3pqm40aiqpfigcgg9dkgjdlggry2iv81s0415xf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -173916,6 +174559,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.2.4.3.0.20";
        sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn";
+       revision = "1";
+       editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -174280,6 +174925,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servius_1_2_0_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
+     , http-types, markdown, shakespeare, text, wai, wai-app-static
+     }:
+     mkDerivation {
+       pname = "servius";
+       version = "1.2.0.3";
+       sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-builder blaze-html bytestring http-types markdown
+         shakespeare text wai wai-app-static
+       ];
+       homepage = "http://github.com/snoyberg/servius#readme";
+       description = "Warp web server with template rendering";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ses-html" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, byteable
      , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time
@@ -176029,8 +176694,8 @@ self: {
     ({ mkDerivation, base, bytestring, hsI2C, time, transformers }:
      mkDerivation {
        pname = "si-clock";
-       version = "0.1.1";
-       sha256 = "1wcw3ws1125lpazar5934v93y76shdl279ll02z8911d3hcx0vh5";
+       version = "0.1.3";
+       sha256 = "0s2d1liaknk5qhh41pi3508m3dz9k0ljl5fc2v1vs6ckv4sd9fjr";
        libraryHaskellDepends = [
          base bytestring hsI2C time transformers
        ];
@@ -182372,6 +183037,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ssh-tunnel" = callPackage
+    ({ mkDerivation, base, foldl, http-client, managed, text
+     , transformers, turtle, uuid
+     }:
+     mkDerivation {
+       pname = "ssh-tunnel";
+       version = "1.0.0.0";
+       sha256 = "1yc2whzyrb0na9risf5q72ll304fh94rraik78ma6g27pjh2yvqx";
+       revision = "1";
+       editedCabalFile = "16h6n2p2v4ijhfap0ym7qidls9sc55jipnxn79g9i90jfsixc7m9";
+       libraryHaskellDepends = [
+         base foldl http-client managed text transformers turtle uuid
+       ];
+       homepage = "https://github.com/Teaspot-Studio/ssh-tunnel#readme";
+       description = "Proxy http-client via ssh tunnel";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sshd-lint" = callPackage
     ({ mkDerivation, base, containers, hspec, keyword-args
      , nagios-check, parsec
@@ -183241,6 +183924,26 @@ self: {
        license = "unknown";
      }) {};
 
+  "stagen" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default
+     , directory, filemanip, lucid, markdown, mtl, optparse-applicative
+     , parallel, parsec, text
+     }:
+     mkDerivation {
+       pname = "stagen";
+       version = "0.0.0";
+       sha256 = "17hvijrkc0lczppp8c73n8drjghn7mmwhdai0m4rilga3vminw7r";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html bytestring data-default directory filemanip
+         lucid markdown mtl optparse-applicative parallel parsec text
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Static site generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "standalone-derive-topdown" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -185900,15 +186603,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "strive_4_0_0" = callPackage
+  "strive_4_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "strive";
-       version = "4.0.0";
-       sha256 = "11z7xxq8157pgpp48argcik0l2323lvjf2rxn01rdk7sx5gby9mh";
+       version = "4.0.1";
+       sha256 = "1bws8z9ky5zryzy7njllm2f7lddbncb1rxz2ngq6kqcdnc14ph2v";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-client
          http-client-tls http-types template-haskell text time transformers
@@ -187033,8 +187736,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.3";
-       sha256 = "008k36ica9l6k77729mvcmgjdjayn47q468wn20bcb7anc04sijn";
+       version = "0.0.1.4";
+       sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -189626,8 +190329,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.11.2.5";
-       sha256 = "09qg2ssack4y3vy5dppjpprvg7gss970a0nfv0rq2m87gw5r3i1h";
+       version = "0.11.3";
+       sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
          optparse-applicative regex-tdfa stm tagged unbounded-delays unix
@@ -190797,6 +191500,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "template-toolkit" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text
+     , unordered-containers, uri-encode
+     }:
+     mkDerivation {
+       pname = "template-toolkit";
+       version = "0.1.0.1";
+       sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory mtl parsec pcre-utils
+         regex-pcre-builtin scientific text unordered-containers uri-encode
+       ];
+       homepage = "https://github.com/kobargh/template-toolkit";
+       description = "Template Toolkit implementation for Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "template-yj" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
@@ -192268,8 +192989,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-format-heavy";
-       version = "0.1.3.0";
-       sha256 = "1cv6j0g3x7xw6ivfs9x2hdv063jsa2739zc6x8fya9540l8d4hys";
+       version = "0.1.4.0";
+       sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n";
        libraryHaskellDepends = [
          base bytestring containers data-default parsec text time
        ];
@@ -196352,6 +197073,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "torsor" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "torsor";
+       version = "0.1";
+       sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/andrewthad/torsor#readme";
+       description = "Torsor Typeclass";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tostring" = callPackage
     ({ mkDerivation, base, case-insensitive, text, utf8-string }:
      mkDerivation {
@@ -197335,6 +198068,8 @@ self: {
        pname = "tree-diff";
        version = "0";
        sha256 = "1xiwnq1rrbkzarz5ylnq0p8xk3ldjg7cj7cbmdalr1507qg7wdn7";
+       revision = "1";
+       editedCabalFile = "0gclbdb5pa2f7fzkqyqdhdq57v55w6w0nx9khn9piih1zw6qlnqh";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
@@ -201662,23 +202397,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath
-     , monad-logger, resourcet, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.1.0.0";
-       sha256 = "053swazav18rrmlwskrgnw99wn7j7wznaadjmsf8nmzk13qzn18i";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath monad-logger resourcet
-         transformers unix unliftio-core
-       ];
-       homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_1_1_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath
      , monad-logger, resourcet, transformers, unix, unliftio-core
      }:
@@ -201693,7 +202411,6 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -206692,8 +207409,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.1";
        sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0";
-       revision = "2";
-       editedCabalFile = "1yd82xgdmxzjh8vf3bln7ccbr6qiwn6inp9w32lqsgc354ivgrn9";
+       revision = "3";
+       editedCabalFile = "1k6wvqwckccxdvpfi0cinw7pw907rigvgcsj5mib4wxpfwpg5cam";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -211213,6 +211930,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xgboost-haskell" = callPackage
+    ({ mkDerivation, base, foundation, xgboost }:
+     mkDerivation {
+       pname = "xgboost-haskell";
+       version = "0.1.0.0";
+       sha256 = "11n4qhv3w172lyixy9syx8rf45yj4aywac5svf1r1w9grqkyf18b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base foundation ];
+       executableHaskellDepends = [ base foundation ];
+       executableSystemDepends = [ xgboost ];
+       homepage = "https://github.com/sighingnow/xgboost-haskell#readme";
+       description = "XGBoost library for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) xgboost;};
+
   "xhaskell-library" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc-prim, mtl
      , parsec, regex-base
@@ -211427,6 +212160,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xleb" = callPackage
+    ({ mkDerivation, base, containers, mtl, pretty-show, xml }:
+     mkDerivation {
+       pname = "xleb";
+       version = "0.1.0";
+       sha256 = "15nsfnvca9x5z0pcmv949ni2avi7gi159vmx5hw99jxzm0ql5shb";
+       revision = "1";
+       editedCabalFile = "0258818bvkhviqgxa6srm5rvhqw2kiik4i590h0431vjs5c12k72";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers mtl xml ];
+       executableHaskellDepends = [ base pretty-show xml ];
+       homepage = "https://github.com/aisamanra/xleb";
+       description = "A simple monadic language for parsing XML structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xls" = callPackage
     ({ mkDerivation, base, conduit, filepath, getopt-generics
      , resourcet, transformers
@@ -212208,15 +212958,15 @@ self: {
      }:
      mkDerivation {
        pname = "xmlhtml";
-       version = "0.2.5";
-       sha256 = "0760gankqpb9ljh5plj8kzfpixh4lq02p8d4h1j0bb6vhxg107df";
+       version = "0.2.5.1";
+       sha256 = "1m8jiadx7s990xxdw03ac43c4vxa391kgci77axqx6bkai2yak8k";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-builder containers parsec text unordered-containers
        ];
        testHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
-         bytestring-builder directory hspec HUnit text
+         bytestring-builder containers directory hspec HUnit text
        ];
        homepage = "https://github.com/snapframework/xmlhtml";
        description = "XML parser and renderer with HTML 5 quirks mode";

From 25eb5eecb7b124e1ab59fb54e48e12b0b73ab04e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Oct 2017 09:53:07 +0200
Subject: [PATCH 47/97] haskell-fluid-idl-scotty: disable broken build

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a439edecf0d..1ea0e208e29 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -968,6 +968,7 @@ self: super: {
 
   # Depends on broken fluid.
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
+  fluid-idl-scotty = markBroken super.fluid-idl-scotty;
 
   # depends on amqp >= 0.17
   amqp-utils = super.amqp-utils.override {

From 895b4ef59b53ef39409b02b49c9999bc0d369d97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Oct 2017 17:21:09 +0200
Subject: [PATCH 48/97] liquidhaskell: use latest aeson

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1ea0e208e29..1aa063447e5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -892,7 +892,7 @@ self: super: {
   tailfile-hinotify = dontCheck super.tailfile-hinotify;
 
   # build liquidhaskell with the proper (new) aeson version
-  liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; };
+  liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_3_0; };
 
   # Test suite fails: https://github.com/lymar/hastache/issues/46.
   # Don't install internal mkReadme tool.

From d559edc277cdcbcfb7b095e97e65efdfaad5424e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 21 Oct 2017 20:42:20 -0400
Subject: [PATCH 49/97] git-annex: update sha

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1aa063447e5..f0ee15468a6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -98,7 +98,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "0ky3avbda1avccalkh7ifjnll37cjjmdyypw9m1glsrzgzmr5lbr";
+      sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From 131b7c28906426f0a31427ec4f07602bdcb072cc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 23 Oct 2017 15:56:56 +0200
Subject: [PATCH 50/97] screen: 4.6.1 -> 4.6.2

See http://lists.gnu.org/archive/html/info-gnu/2017-10/msg00006.html
for release information
---
 pkgs/tools/misc/screen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 6ef042abb15..156db640acd 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "screen-${version}";
-  version = "4.6.1";
+  version = "4.6.2";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "0r3wpfxnr5kw73b8ndja26jk03nfbks06iyfmgb5aqb2rdkazadb";
+    sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v";
   };
 
   configureFlags= [

From c522aaafde483a7c0127eab008b1274de8fd4fda Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Mon, 23 Oct 2017 11:57:20 -0400
Subject: [PATCH 51/97] nixos/postfix: allow dollar parameters in lists
 (#30612)

---
 nixos/doc/manual/release-notes/rl-1803.xml | 8 +++++++-
 nixos/modules/services/mail/postfix.nix    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 47522fe3cc9..6fa14b55386 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -55,7 +55,13 @@ following incompatible changes:</para>
 
 <itemizedlist>
   <listitem>
-    <para></para>
+    <para>
+      Dollar signs in options under <option>services.postfix</option> are
+      passed verbatim to Postfix, which will interpret them as the beginning of
+      a parameter expression. This was already true for string-valued options
+      in the previous release, but not for list-valued options. If you need to
+      pass literal dollar signs through Postfix, double them.
+    </para>
   </listitem>
 </itemizedlist>
 
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index ad4e5814984..2185484827d 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -28,7 +28,7 @@ let
 
   mainCf = let
     escape = replaceStrings ["$"] ["$$"];
-    mkList = items: "\n  " + concatMapStringsSep "\n  " escape items;
+    mkList = items: "\n  " + concatStringsSep "\n  " items;
     mkVal = value:
       if isList value then mkList value
         else " " + (if value == true then "yes"

From c9e08b578b0a75c378bc69939e5bcb0de8f307fa Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Mon, 23 Oct 2017 17:41:45 +0200
Subject: [PATCH 52/97] awesomebump-4.0 -> 5.1

---
 .../graphics/awesomebump/default.nix          | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f1958ca35be..0666788e3e3 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,26 +1,37 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
+{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
 
 stdenv.mkDerivation {
-  name = "awesomebump-4.0";
+  name = "awesomebump-5.1";
 
   src = fetchurl {
-    url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
-    sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+    url = https://github.com/kmkolasinski/AwesomeBump/archive/Winx32v5.1.tar.gz;
+    sha256 = "04s0jj9gfw1rfr82ga2vw6x1jy00ca9p9s3hh31q3k5h6vg5ailn";
   };
 
-  setSourceRoot = "sourceRoot=$(echo */Sources)";
+  buildInputs = [ qtbase qtscript qtdeclarative flex bison gnutar ];
 
-  nativeBuildInputs = [ makeWrapper qmake ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ qmake makeWrapper ];
 
-  enableParallelBuilding = true;
+  buildPhase = ''
+    cd Sources/utils/QtnProperty
+    tar xf "${fetchurl { url = "https://github.com/kmkolasinski/QtnProperty/archive/00e1a9a7cdf6fa84d1b0a35efe752bc2e4a6be1f.tar.gz"; sha256 = "0fdny0khm6jb5816d5xsijp26xrkz2ksz8w9pv1x4hf32l48s9yn"; } }"
+    mv QtnProperty-*/* .
+    rm -r QtnProperty-*
+    alias
+    $QMAKE Property.pro -r TOP_SRC_DIR=$(pwd)
+    make
+    cd ../../../
+    $QMAKE
+    make
+    cp -vr workdir/`cat workdir/current`/bin/AwesomeBump Bin
+  '';
 
   installPhase =
     ''
       d=$out/libexec/AwesomeBump
       mkdir -p $d $out/bin
-      cp AwesomeBump $d/
-      cp -prd ../Bin/Configs ../Bin/Core $d/
+      cp Bin/AwesomeBump $d/
+      cp -prd Bin/Configs Bin/Core $d/
 
       # AwesomeBump expects to find Core and Configs in its current
       # directory.

From 26122b368a446ca54144faa6ff0ff4d2c5559658 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 23 Oct 2017 17:53:11 +0100
Subject: [PATCH 53/97] citrix_receiver: refactor so older versions can still
 be installed

Version 13.4.0 is the latest version that doesn't suffer from the bug
described at
https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/page-2#entry1977735

As a result, upgrades to 13.5.0, 13.6.0 and 13.7.0 were postponed.
However some users aren't affected by this big. This enables everyone to
download the version that suits their needs.

Related to: #23975, #27664, #30029
---
 .../remote/citrix-receiver/default.nix        | 301 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   8 +-
 2 files changed, 180 insertions(+), 129 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 0645e9cb606..f6be80e4a1d 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , requireFile
 , makeWrapper
 , libredirect
@@ -22,154 +23,198 @@
 , alsaLib
 , libidn
 , zlib
+, version ? null
 }:
 
-let versionRec = { major = "13"; minor = "7"; patch = "0"; };
-in stdenv.mkDerivation rec {
-  name = "citrix-receiver-${version}";
-  version = with versionRec; "${major}.${minor}.${patch}";
-  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
+let
+  versionInfo = {
+    "13.4.0" = rec {
+      major     = "13";
+      minor     = "4";
+      patch     = "0";
+      x64hash   = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb";
+      x86hash   = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
+      x64suffix = "10109380";
+      x86suffix = x64suffix;
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html;
+    };
 
-  prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
+    "13.5.0" = rec {
+      major     = "13";
+      minor     = "5";
+      patch     = "0";
+      x64hash   = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x";
+      x86hash   = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1";
+      x64suffix = "10185126";
+      x86suffix = x64suffix;
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html;
+    };
 
-  src = with versionRec; requireFile rec {
-    name =
-      if stdenv.is64bit
-      then "${prefixWithBitness}-${version}.10276927.tar.gz"
-      else "${prefixWithBitness}-${version}.10276925.tar.gz";
-    sha256 =
-      if stdenv.is64bit
-      then "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"
-      else "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
-    message = ''
-      In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
-      the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+    "13.6.0" = rec {
+      major     = "13";
+      minor     = "6";
+      patch     = "0";
+      x64hash   = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34";
+      x86hash   = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2";
+      x64suffix = "10243651";
+      x86suffix = x64suffix;
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html;
+    };
 
-      ${homepage}
-
-      (if you do not find version ${version} there, try at
-      https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
-      or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
-
-      Once you have downloaded the file, please use the following command and re-run the
-      installation:
-
-      nix-prefetch-url file://\$PWD/${name}
-    '';
+    "13.7.0" = {
+      major     = "13";
+      minor     = "7";
+      patch     = "0";
+      x64hash   = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91";
+      x86hash   = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # Fix when updating version
+      x64suffix = "10276927";
+      x86suffix = "10276925";
+    };
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
+  citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
+    stdenv.mkDerivation rec {
+      name     = "citrix-receiver-${version}";
+      version  = "${major}.${minor}.${patch}";
+      inherit homepage;
 
-  sourceRoot = ".";
+      prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
-  buildInputs = [
-    makeWrapper
-    busybox
-    file
-    gtk2
-    gdk_pixbuf
-  ];
+      src = requireFile rec {
+        name    = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
+        sha256  = if stdenv.is64bit then x64hash else x86hash;
+        message = ''
+          In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
+          the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
 
-  libPath = stdenv.lib.makeLibraryPath [
-    glib
-    gtk2
-    atk
-    gdk_pixbuf
-    cairo
-    pango
-    gnome3.dconf
-    xlibs.libX11
-    xlibs.libXext
-    xlibs.libXrender
-    xlibs.libXinerama
-    xlibs.libXfixes
-    libpng12
-    libidn
-    zlib
-    gtk_engines
-    freetype
-    fontconfig
-    alsaLib
-    stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
-  ];
+          ${homepage}
 
-  desktopItem = makeDesktopItem {
-    name = "wfica";
-    desktopName = "Citrix Receiver";
-    genericName = "Citrix Receiver";
-    exec = "wfica";
-    icon = "wfica";
-    comment = "Connect to remote Citrix server";
-    categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
-    mimeType = "application/x-ica";
-  };
+          (if you do not find version ${version} there, try at
+          https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/
+          or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
 
-  installPhase = ''
-    export ICAInstDir="$out/opt/citrix-icaclient"
+          Once you have downloaded the file, please use the following command and re-run the
+          installation:
 
-    sed -i \
-      -e 's,^main_install_menu$,install_ICA_client,g' \
-      -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
-      -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
-      -e 's,/bin/true,true,g' \
-      ./${prefixWithBitness}/hinst
+          nix-prefetch-url file://\$PWD/${name}
+        '';
+      };
 
-    # Run the installer...
-    ./${prefixWithBitness}/hinst CDROM "`pwd`"
+      phases = [ "unpackPhase" "installPhase" ];
 
-    echo "Deleting broken links..."
-    for link in `find $ICAInstDir -type l `
-    do
-      [ -f "$link" ] || rm -v "$link"
-    done
+      sourceRoot = ".";
 
-    echo "Expanding certificates..."
-    # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
-    pushd "$ICAInstDir/keystore/cacerts"
-    awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
-    popd
+      buildInputs = [
+        makeWrapper
+        busybox
+        file
+        gtk2
+        gdk_pixbuf
+      ];
 
-    echo "Patching executables..."
-    find $ICAInstDir -type f -exec file {} \; |
-      grep 'ELF.*executable' |
-      cut -f 1 -d : |
-      while read f
-      do
-        echo "Patching ELF intrepreter and rpath for $f"
-        chmod u+w "$f"
-        patchelf \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          --set-rpath "$ICAInstDir:$libPath" "$f"
-      done
+      libPath = stdenv.lib.makeLibraryPath [
+        glib
+        gtk2
+        atk
+        gdk_pixbuf
+        cairo
+        pango
+        gnome3.dconf
+        xlibs.libX11
+        xlibs.libXext
+        xlibs.libXrender
+        xlibs.libXinerama
+        xlibs.libXfixes
+        libpng12
+        libidn
+        zlib
+        gtk_engines
+        freetype
+        fontconfig
+        alsaLib
+        stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
+      ];
 
-    echo "Wrapping wfica..."
-    mkdir "$out/bin"
+      desktopItem = makeDesktopItem {
+        name        = "wfica";
+        desktopName = "Citrix Receiver";
+        genericName = "Citrix Receiver";
+        exec        = "wfica";
+        icon        = "wfica";
+        comment     = "Connect to remote Citrix server";
+        categories  = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
+        mimeType    = "application/x-ica";
+      };
 
-    makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
-      --add-flags "-icaroot $ICAInstDir" \
-      --set ICAROOT "$ICAInstDir" \
-      --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-      --set LD_LIBRARY_PATH "$libPath" \
-      --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+      installPhase = ''
+        export ICAInstDir="$out/opt/citrix-icaclient"
 
-    echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
-    echo UTC > "$ICAInstDir/timezone"
+        sed -i \
+          -e 's,^main_install_menu$,install_ICA_client,g' \
+          -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
+          -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
+          -e 's,/bin/true,true,g' \
+          ./${prefixWithBitness}/hinst
 
-    echo "Installing desktop item..."
-    mkdir -p $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications
+        # Run the installer...
+        ./${prefixWithBitness}/hinst CDROM "`pwd`"
 
-    # We introduce a dependency on the source file so that it need not be redownloaded everytime
-    echo $src >> "$out/share/nix_dependencies.pin"
-  '';
+        echo "Deleting broken links..."
+        for link in `find $ICAInstDir -type l `
+        do
+          [ -f "$link" ] || rm -v "$link"
+        done
 
-  meta = with stdenv.lib; {
-    license = stdenv.lib.licenses.unfree;
-    homepage = homepage;
-    description = "Citrix Receiver";
-    maintainers = with maintainers; [ obadz a1russell ];
-    platforms = platforms.linux;
-  };
-}
+        echo "Expanding certificates..."
+        # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
+        pushd "$ICAInstDir/keystore/cacerts"
+        awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
+        popd
+
+        echo "Patching executables..."
+        find $ICAInstDir -type f -exec file {} \; |
+          grep 'ELF.*executable' |
+          cut -f 1 -d : |
+          while read f
+          do
+            echo "Patching ELF intrepreter and rpath for $f"
+            chmod u+w "$f"
+            patchelf \
+              --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+              --set-rpath "$ICAInstDir:$libPath" "$f"
+          done
+
+        echo "Wrapping wfica..."
+        mkdir "$out/bin"
+
+        makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+          --add-flags "-icaroot $ICAInstDir" \
+          --set ICAROOT "$ICAInstDir" \
+          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
+          --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+          --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+          --set LD_LIBRARY_PATH "$libPath" \
+          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+
+        echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
+        echo UTC > "$ICAInstDir/timezone"
+
+        echo "Installing desktop item..."
+        mkdir -p $out/share/applications
+        cp ${desktopItem}/share/applications/* $out/share/applications
+
+        # We introduce a dependency on the source file so that it need not be redownloaded everytime
+        echo $src >> "$out/share/nix_dependencies.pin"
+      '';
+
+      meta = with stdenv.lib; {
+        license     = stdenv.lib.licenses.unfree;
+        inherit homepage;
+        description = "Citrix Receiver";
+        maintainers = with maintainers; [ obadz a1russell ];
+        platforms   = platforms.linux;
+      };
+    };
+
+in citrixReceiverForVersion (lib.getAttr version versionInfo)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88914330b34..74ef6e0f3f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1398,7 +1398,13 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
+  # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)"
+  # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735
+  citrix_receiver        = hiPrio citrix_receiver_13_7_0;
+  citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
+  citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; };
+  citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; };
+  citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; };
 
   citra = libsForQt5.callPackage ../misc/emulators/citra { };
 

From a798a434d18ded919b1a826304b1920b0e25437c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Oct 2017 19:21:16 +0200
Subject: [PATCH 54/97] perl-AnyEvent-I3: 0.16 -> 0.17

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9f1423c65c1..21e3dab32f8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -156,10 +156,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AnyEventI3 = buildPerlPackage rec {
-    name = "AnyEvent-I3-0.16";
+    name = "AnyEvent-I3-0.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz";
-      sha256 = "1qwva5vmmn929l6k9wzhp4h80ad4qm4m1g2dyv4nlas624003hig";
+      sha256 = "5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63";
     };
     propagatedBuildInputs = [ AnyEvent JSONXS ];
     meta = {

From 0204936c2105aa6ab3b24c3c31ca667827cdbb5e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Oct 2017 19:22:12 +0200
Subject: [PATCH 55/97] perl-AnyEvent: 7.08 -> 7.14

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 21e3dab32f8..71f43709d27 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -119,14 +119,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   AnyEvent = buildPerlPackage rec {
-    name = "AnyEvent-7.08";
+    name = "AnyEvent-7.14";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8";
+      sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a";
     };
+    buildInputs = [ CanaryStability ];
     meta = {
-      maintainers = with maintainers; [ ];
-      platforms   = stdenv.lib.platforms.unix;
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 

From 499195347fc512ac15b6d9a53676362e539170a1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Oct 2017 19:22:39 +0200
Subject: [PATCH 56/97] perl-AnyEvent-RabbitMQ: 1.15 -> 1.19

---
 pkgs/top-level/perl-packages.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 71f43709d27..eb32ded2cd2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -168,19 +168,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  AnyEventRabbitMQ = buildPerlPackage {
-    name = "AnyEvent-RabbitMQ-1.15";
+  AnyEventRabbitMQ = buildPerlPackage rec {
+    name = "AnyEvent-RabbitMQ-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/AnyEvent-RabbitMQ-1.15.tar.gz;
-      sha256 = "fda292dfaae10f6d99aafc46831ce507153b58368e3eb2617bbb3f749605805a";
+      url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/${name}.tar.gz";
+      sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
     meta = {
       description = "An asynchronous and multi channel Perl AMQP client";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
-      platforms   = stdenv.lib.platforms.unix;
     };
   };
 

From 3bf2a5168a8f018a038603ecaa55b4ecbcefa633 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Oct 2017 19:23:10 +0200
Subject: [PATCH 57/97] perl-Term-ProgressBar: 2.14 -> 2.21

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eb32ded2cd2..bb191f45bd2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13110,11 +13110,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TermProgressBar = buildPerlPackage {
-    name = "Term-ProgressBar-2.14";
+  TermProgressBar = buildPerlPackage rec {
+    name = "Term-ProgressBar-2.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.14.tar.gz;
-      sha256 = "18cj7mzbis9xk0v32g2700vq9b4p9v5msk02mglf244cj77bflf6";
+      url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz";
+      sha256 = "66994f1a6ca94d8d92e3efac406142fb0d05033360c0acce2599862db9c30e44";
     };
     buildInputs = [ CaptureTiny TestException ];
     propagatedBuildInputs = [ ClassMethodMaker TermReadKey ];

From 68e05a361d4fa0f71e98fae69882e670dfa4dd48 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 23 Oct 2017 19:17:40 +0200
Subject: [PATCH 58/97] haskell: ghcjs packages: fix build of fail

---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 0f17f5ce707..bd35c1cb3ae 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -68,6 +68,9 @@ self: super:
 
 ## OTHER PACKAGES
 
+  # haddock throws the error: No input file(s).
+  fail = dontHaddock super.fail;
+
   cereal = addBuildDepend super.cereal [ self.fail ];
 
   entropy = overrideCabal super.entropy (old: {

From d2f9dc4a3b79c575618b09f239c0ec3e26a371d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Oct 2017 20:11:14 +0200
Subject: [PATCH 59/97] haskell-ltk: fix build by providing
 haskell-gi-overloading-0.0

Closes https://github.com/NixOS/nixpkgs/pull/30462.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f0ee15468a6..2b050dd613f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -971,7 +971,9 @@ self: super: {
   fluid-idl-scotty = markBroken super.fluid-idl-scotty;
 
   # depends on amqp >= 0.17
-  amqp-utils = super.amqp-utils.override {
-    amqp = dontCheck super.amqp_0_18_1;
-  };
+  amqp-utils = super.amqp-utils.override { amqp = dontCheck super.amqp_0_18_1; };
+
+  # Build with gi overloading feature disabled.
+  ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; });
+
 }

From c42e772a625f9fc55c5541feebacd086ebd40130 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 23 Oct 2017 20:25:51 +0200
Subject: [PATCH 60/97] hevea: 2.29 -> 2.31

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

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index ed6e741b3f9..e125c8e7f2f 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.29";
+  name = "hevea-2.31";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6";
+    sha256 = "15xrnnqlacz8dpr09h7jgijm65wss99rmy9mb1zmapplmwhavmzv";
   };
 
   buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];

From e2e5979a1e2124157677e67e6a3eec11fccf30c5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Oct 2017 14:43:28 -0400
Subject: [PATCH 61/97] ammonite: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 46a213f219d..f0a9837ce48 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "11xn84q947qrf0p2p37pyx9nphl6542jbdan3mjcmdi4p29qgds8";
+    sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 4c81e9a926f4e372c0070b8060848f09d44395d6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 23 Oct 2017 20:56:08 +0200
Subject: [PATCH 62/97] libfilezilla: 0.10.1 -> 0.11.0

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 3981f94a47d..5447e7d8b54 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.10.1";
+  version = "0.11.0";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1yi9db0hpxh3giyjhkbz7ajmf95qw27xdvh3xvw208zri5k575x0";
+    sha256 = "1l4yhw269dyarqb2spqhycxzzyfn8pj4qh9vfycdw1c93hj6fx6c";
   };
 
   meta = with stdenv.lib; {

From 740c4fe4afc5917fb9f170dc0815c7b3b1e25223 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 23 Oct 2017 20:56:24 +0200
Subject: [PATCH 63/97] filezilla: 3.27.1 -> 3.28.0

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index a7d32494912..86b4a1fd6ea 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.27.1"; in
+let version = "3.28.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "14lsplbp9fy7lk6cpwi3aj6jskz4j82h67x0fik82z1bns0zm2a3";
+    sha256 = "1dxzmpqrb3a29ln9vx10n438w5i649729vy911sm92bwn2p235p4";
   };
 
   configureFlags = [

From 4b756e48738dc0775dacb6b97280a17799d66147 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 9 Oct 2017 20:22:34 +0100
Subject: [PATCH 64/97] foomatic-filters: fix CVE-2015-8327 & CVE-2015-8560

---
 pkgs/misc/drivers/foomatic-filters/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index 799b14dec1d..d6ac4fd6a03 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, cups, dbus, enscript }:
+{ stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }:
 
 stdenv.mkDerivation rec {
   name = "foomatic-filters-4.0.17";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ perl cups dbus enscript ];
 
+  patches = [
+    # for CVE-2015-8327 & CVE-2015-8560
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git/plain/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch";
+      sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4";
+    })
+  ];
+
   preConfigure =
     ''
       substituteInPlace foomaticrip.c --replace /bin/bash /bin/sh

From 6af0de6478a7028b6fd73fbd44cacf0c13c7be99 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Oct 2017 22:16:36 +0200
Subject: [PATCH 65/97] imagemagick: 6.9.9-15 -> 6.9.9-20

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index d01bfa1d950..35e4fb989b3 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.9-15";
-    sha256 = "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c";
+    version = "6.9.9-20";
+    sha256 = "1pz8clmhnq26vdsp1j21czq3nfbvrmfdz30k7na7w4vh7wqxsrx1";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From bb493911516b812d5e03567836fb049c2ee02608 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Oct 2017 22:16:57 +0200
Subject: [PATCH 66/97] imagemagick7: 7.0.7-4 -> 7.0.7-8

---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index a70a67d548f..f2046f0d912 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-4";
-    sha256 = "074w4jm5s98b8dxwjl8lljvdhmm3mbg1ikgjy1mw3c1sb08z3nc8";
+    version = "7.0.7-8";
+    sha256 = "0h2jbaxrxrmdcr5crf1d93sc60v4zfqrrl3w79md6h11wf57ksbp";
     patches = [];
   };
 in

From 63f7456f6ac63ec03268eb85766153cdb9b6d444 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 23 Oct 2017 16:22:16 -0400
Subject: [PATCH 67/97] amazon-image: make derivation name configurable

I'm getting dozens of nixos-disk-image entries in my store and it's
getting hard to track :)
---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index d76fb644d02..2e67edf8ee3 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -9,6 +9,12 @@ in {
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
   options.amazonImage = {
+    name = mkOption {
+      type = types.str;
+      description = "The name of the generated derivation";
+      default = "nixos-disk-image";
+    };
+
     contents = mkOption {
       example = literalExample ''
         [ { source = pkgs.memtest86 + "/memtest.bin";
@@ -38,7 +44,7 @@ in {
 
   config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
     inherit lib config;
-    inherit (cfg) contents format;
+    inherit (cfg) contents format name;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitioned = config.ec2.hvm;
     diskSize = cfg.sizeMB;

From 62b467a07d35fe0bc93d776382a45b393c626d6c Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 23 Oct 2017 22:34:44 +0200
Subject: [PATCH 68/97] gthumb: 3.5.1 -> 3.5.3

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

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 93894d0c6cb..d9e0f42e53e 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -6,12 +6,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gthumb";
-  version = "${major}.1";
+  version = "${major}.3";
   major = "3.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
-    sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202";
+    sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From 2c39cb9f40c397576ee61c1f8f922eff80707ce0 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Mon, 23 Oct 2017 15:35:39 -0600
Subject: [PATCH 69/97] jenkins: 2.85 -> 2.86

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 1c5950a04c2..de0321109d7 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.85";
+  version = "2.86";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0z8rv6fxsvnw71f8s711n9s60r8jd43bigy9rqz5805k3xa68whr";
+    sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0";
   };
 
   buildCommand = ''

From 25ea55046d8b823779b1cd6628654876913fc706 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Mon, 23 Oct 2017 18:54:26 -0400
Subject: [PATCH 70/97] makeself: 2.2.0 -> 2.3.1

---
 pkgs/applications/misc/makeself/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 361ced02b7e..8a752bbaf86 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "makeself-2.2.0";
+  version = "2.3.1";
+  name = "makeself-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/megastep/makeself.git";
-    rev = "b836b9281ae99abe1865608b065551da56c80719";
-    sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";
+  src = fetchFromGitHub {
+    owner = "megastep";
+    repo = "makeself";
+    rev = "release-${version}";
+    sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p";
   };
 
   patchPhase = ''

From cccee1ddb7fc34e3ee4e549cdcc4e07d34a0f9f6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 23 Apr 2017 20:23:22 +0800
Subject: [PATCH 71/97] minuet: init at 17.08.1

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/minuet.nix  | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/minuet.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 2053d183ff1..8f84044a1b1 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -142,6 +142,7 @@ let
       marble = callPackage ./marble.nix {};
       mbox-importer = callPackage ./mbox-importer.nix {};
       messagelib = callPackage ./messagelib.nix {};
+      minuet = callPackage ./minuet.nix {};
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
new file mode 100644
index 00000000000..fd628a7aacf
--- /dev/null
+++ b/pkgs/applications/kde/minuet.nix
@@ -0,0 +1,22 @@
+{ mkDerivation
+, lib, extra-cmake-modules
+, drumstick, fluidsynth
+, kcoreaddons, kcrash, kdoctools
+, qtquickcontrols2, qtsvg, qttools
+}:
+
+mkDerivation {
+  name = "minuet";
+  meta = with lib; {
+    license = with licenses; [ lgpl21 gpl3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    drumstick fluidsynth
+    kcoreaddons kcrash
+    qtquickcontrols2 qtsvg qttools
+  ];
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74ef6e0f3f2..510509d144e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15244,7 +15244,7 @@ with pkgs;
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf
     kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
-    kontact korganizer krfb kwalletmanager marble okteta okular spectacle;
+    kontact korganizer krfb kwalletmanager marble minuet okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From 5ddea062e269c124346c8d2c6cee1eac1aa36bfd Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 23 Oct 2017 23:23:23 -0700
Subject: [PATCH 72/97] ffmpeg: 3.3.4 -> 3.4

ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree
---
 pkgs/development/libraries/ffmpeg-full/default.nix     | 4 ++--
 pkgs/development/libraries/ffmpeg/{3.3.nix => 3.4.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/ffmpeg/{3.3.nix => 3.4.nix} (69%)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 275389b7b8b..11d365159f8 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.3.4";
+  version = "3.4";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq";
+    sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf";
   };
 
   patchPhase = ''patchShebangs .
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
similarity index 69%
rename from pkgs/development/libraries/ffmpeg/3.3.nix
rename to pkgs/development/libraries/ffmpeg/3.4.nix
index 3218461258d..513654e98f7 100644
--- a/pkgs/development/libraries/ffmpeg/3.3.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -6,7 +6,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}";
-  branch = "3.3.4";
-  sha256 = "0zmczggi95fbsq9nz33mpln1y3p1gqniqc4x5smp871idhkykxay";
+  branch = "3.4";
+  sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax";
   darwinFrameworks = [ Cocoa CoreMedia ];
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 510509d144e..a5c7e0af075 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8098,14 +8098,14 @@ with pkgs;
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
-  ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix {
+  ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
-  ffmpeg_3 = ffmpeg_3_3;
+  ffmpeg_3 = ffmpeg_3_4;
   ffmpeg = ffmpeg_3;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {

From 83d7fe0f0d062f19500b9befd1338ff2a13d8535 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 23 Oct 2017 23:24:15 -0700
Subject: [PATCH 73/97] wineUnstable: 2.18 -> 2.19

staging and winetricks updated as well
---
 pkgs/misc/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index fb384aee746..2eb7b722e82 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,23 +32,23 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.18";
+    version = "2.19";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz";
+    sha256 = "15b0lvs456zjh5wwkhs9wh1ycih12ragk6170hnrrbkmk3k32wa8";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8";
+    sha256 = "16jps0x4srxnpdy3vxygvspz7qpd09i83c6j6kg8vv4qkna2lswi";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170823";
-    sha256 = "15kjic39nl3z4g9l9galwkajl108fxfwaa0d9nssp54wg6villwx";
+    version = "20171018";
+    sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 5fe5afe8ee15ac06c83bd4ff446421d998f35831 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 24 Oct 2017 08:42:26 +0200
Subject: [PATCH 74/97] clasp-common-lisp: init at 0.4.99.20170801

---
 pkgs/development/compilers/clasp/default.nix | 74 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/compilers/clasp/default.nix

diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
new file mode 100644
index 00000000000..6bfb71a9627
--- /dev/null
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -0,0 +1,74 @@
+{stdenv, fetchFromGitHub
+  , llvmPackages
+  , cmake, boehmgc, gmp, zlib, ncurses, boost
+  , waf, python, git, sbcl
+}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "clasp";
+  version = "0.4.99.20170801";
+
+  src = fetchFromGitHub {
+    owner = "drmeister";
+    repo = "clasp";
+    rev = "525ce1cffff39311e3e7df6d0b71fa267779bdf5";
+    sha256 = "1jqya04wybgxnski341p5sycy2gysxad0s5q8d59z0f6ckj3v8k1";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake python git sbcl ];
+
+  buildInputs = with llvmPackages; (
+    builtins.map (x: stdenv.lib.overrideDerivation x
+         (x: {NIX_CFLAGS_COMPILE= (x.NIX_CFLAGS_COMPILE or "") + " -frtti"; }))
+      [ llvm clang clang-unwrapped clang ]) ++
+  [
+    gmp zlib ncurses
+    boost boehmgc
+    (boost.override {enableStatic = true; enableShared = false;})
+    (stdenv.lib.overrideDerivation boehmgc
+      (x: {configureFlags = (x.configureFlags or []) ++ ["--enable-static"];}))
+  ];
+
+  NIX_CFLAGS_COMPILE = " -frtti ";
+
+  configurePhase = ''
+    runHook preConfigure
+
+    export CXX=clang++
+    export CC=clang
+
+    echo "
+      INSTALL_PATH_PREFIX = '$out'
+    " | sed -e 's/^ *//' > wscript.config
+
+    python ./waf configure update_submodules
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    python ./waf build_cboehm
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    python ./waf install_cboehm
+
+    runHook postInstall
+  '';
+
+  meta = {
+    inherit version;
+    description = ''A Common Lisp implementation based on LLVM with C++ integration'';
+    license = stdenv.lib.licenses.lgpl21Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/drmeister/clasp";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5c7e0af075..8a0280bcdf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5418,6 +5418,8 @@ with pkgs;
   clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack;
   libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
 
+  clasp-common-lisp = callPackage ../development/compilers/clasp {};
+
   clean = callPackage ../development/compilers/clean { };
 
   closurecompiler = callPackage ../development/compilers/closure { };

From aadbef00bd083fe59977205b2fc330cf17d09e6f Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 24 Oct 2017 03:00:07 -0400
Subject: [PATCH 75/97] callCabal2nix: Don't rebuild unchanged cabal file
 (Fixed #23880)

---
 .../haskell-modules/make-package-set.nix        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index d84167008d9..c234ff3e780 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -144,7 +144,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     callHackage = name: version: self.callPackage (self.hackage2nix name version);
 
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
-    callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
+    callCabal2nix = name: src: args: if builtins.typeOf src != "path"
+      then self.callPackage (haskellSrc2nix { inherit name src; }) args
+      else
+        # When `src` is a Nix path literal, only use `cabal2nix` on
+        # the cabal file, so that the "import-from-derivation" is only
+        # recomputed when the cabal file changes, and so your source
+        # code isn't duplicated into the nix store on every change.
+        # This can only be done when `src` is a Nix path literal
+        # because that is the only kind of source that
+        # `builtins.filterSource` works on. But this filtering isn't
+        # usually important on other kinds of sources, like
+        # `fetchFromGitHub`.
+        overrideCabal (self.callPackage (haskellSrc2nix {
+          inherit name;
+          src = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
+        }) args) (_: { inherit src; });
 
     # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet
     # Given a set whose values are either paths or version strings, produces

From 770bedbc204a8b696b43110f54eca98201207697 Mon Sep 17 00:00:00 2001
From: Alex Vorobiev <alexander.vorobiev@gmail.com>
Date: Mon, 23 Oct 2017 20:51:14 -0500
Subject: [PATCH 76/97] meritous: init at 1.4

---
 lib/maintainers.nix             |  1 +
 pkgs/games/meritous/default.nix | 40 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/games/meritous/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4bb12dcfcc8..a44dc3d4da0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,6 +31,7 @@
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
   akc = "Anders Claesson <akc@akc.is>";
+  alexvorobiev = "Alex Vorobiev <alexander.vorobiev@gmail.com";
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
   alibabzo = "Alistair Bill <alistair.bill@gmail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
new file mode 100644
index 00000000000..8d49d38b415
--- /dev/null
+++ b/pkgs/games/meritous/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib, binutils }:
+
+stdenv.mkDerivation rec {
+  name = "meritous-${version}";
+  version = "1.4";
+
+  src = fetchFromGitLab {
+    owner = "meritous";
+    repo = "meritous";
+    rev = "314af46d84d2746eec4c30a0f63cbc2e651d5303";
+    sha256 = "1hrwm65isg5nwzydyd8gvgl3p36sbj09rsn228sppr8g5p9sm10x";
+  };
+
+  prePatch = ''
+    substituteInPlace Makefile \
+      --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \
+      --replace sld-config ${SDL.dev}/bin/sdl-config
+    substituteInPlace src/audio.c \
+      --replace "filename[64]" "filename[256]"
+  '';
+
+  buildInputs = [ SDL SDL_image SDL_mixer zlib ];
+
+  installPhase = ''
+    install -m 555 -D meritous $out/bin/meritous
+    mkdir -p $out/share/meritous
+    cp -r dat/* $out/share/meritous/
+  '';
+
+  hardeningDisable = [ "stackprotector" "fortify" ];
+
+  meta = with stdenv.lib; {
+    description = "Action-adventure dungeon crawl game";
+    homepage = http://www.asceai.net/meritous/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.alexvorobiev ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0280bcdf4..170a487f768 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1141,6 +1141,8 @@ with pkgs;
 
   masscan = callPackage ../tools/security/masscan { };
 
+  meritous = callPackage ../games/meritous { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };

From cd4df565ef77e40eddc98e2d6343ca83b109b358 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <coudron@iij.ad.jp>
Date: Tue, 24 Oct 2017 16:56:06 +0900
Subject: [PATCH 77/97] msmtp: compiles with keyring support by default
 (#30584)

* msmtp: compiles with keyring support by default

As it is recommended by msmtp http://msmtp.sourceforge.net/doc/msmtp.html#Authentication
---
 pkgs/applications/networking/msmtp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 85e5abdc9b6..1a409fc885a 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig
 , openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+, withKeyring ? true, libsecret ? null
 , systemd ? null }:
 
 let
@@ -20,7 +21,9 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl gnutls gsasl libidn ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ stdenv.lib.optional stdenv.isDarwin Security
+    ++ stdenv.lib.optional withKeyring libsecret;
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   configureFlags =

From 87bd0494ba41b86e24cfba011425346814b3a9af Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 24 Oct 2017 10:25:17 +0800
Subject: [PATCH 78/97] krdc: init at 17.08.1

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/krdc.nix    | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/krdc.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8f84044a1b1..6e10afe637b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -124,6 +124,7 @@ let
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
+      krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
       ktnef = callPackage ./ktnef.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix
new file mode 100644
index 00000000000..87204c1fe9f
--- /dev/null
+++ b/pkgs/applications/kde/krdc.nix
@@ -0,0 +1,25 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, makeWrapper,
+  kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
+  libvncserver, freerdp
+}:
+
+mkDerivation {
+  name = "krdc";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+  buildInputs = [
+    kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons
+    freerdp libvncserver
+  ];
+  postFixup = ''
+    wrapProgram $out/bin/krdc \
+      --prefix PATH : ${lib.makeBinPath [ freerdp ]}
+  '';
+  meta = with lib; {
+    homepage = http://www.kde.org;
+    license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170a487f768..f4d920ee651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15248,7 +15248,7 @@ with pkgs;
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf
     kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
-    kontact korganizer krfb kwalletmanager marble minuet okteta okular spectacle;
+    kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From b752a9e43356d69666ec6e1a3a7b5d92248b906e Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Tue, 24 Oct 2017 10:48:19 +0200
Subject: [PATCH 79/97] graylog: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 516e27dee7f..11cbd87024f 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.1";
+  version = "2.3.2";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "1zms24w4lnisjqgkj4a8cmnmlvpsqjl1sab5k99dyknq7b31x0sd";
+    sha256 = "0mzrhzbyblspia3qp85hvv5kdc7v3aird02q2pxrxbwca6wjlxcs";
   };
 
   dontBuild = true;

From 707b6b12cc0b0399d1fe1c83b9110a4bab16b861 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 24 Oct 2017 17:14:24 +0800
Subject: [PATCH 80/97] minicom: 2.7 -> 2.7.1

---
 pkgs/tools/misc/minicom/default.nix           | 52 +++++++-----
 .../minicom/xminicom_terminal_paths.patch     | 79 +++++++++++++++++++
 2 files changed, 112 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/tools/misc/minicom/xminicom_terminal_paths.patch

diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index d731e856790..5796f6335c0 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,32 +1,46 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.7";
+  name = "minicom-2.7.1";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/file/3977/${name}.tar.gz";
-    sha256 = "1x04m4k7c71j5cnhzpjrbz43dd96k4mpkd0l87v5skrgp1isdhws";
+    url    = "https://alioth.debian.org/frs/download.php/latestfile/3/${name}.tar.gz";
+    sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk";
   };
 
-  buildInputs = [ncurses];
+  buildInputs = [ ncurses ];
 
-  configureFlags = [ "--sysconfdir=/etc" "--enable-lock-dir=/var/lock" ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  preConfigure =
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--enable-lock-dir=/var/lock"
+  ];
+
+  patches = [ ./xminicom_terminal_paths.patch ];
+
+  preConfigure = ''
     # Have `configure' assume that the lock directory exists.
-    '' sed -i "configure" -e's/test -d \$UUCPLOCK/true/g'
-    '';
+    substituteInPlace configure \
+      --replace 'test -d $UUCPLOCK' true
 
-  meta = {
+    substituteInPlace src/rwconf.c \
+      --replace /usr/bin/ascii-xfr $out/bin/ascii-xfr
+  '';
+
+  meta = with stdenv.lib; {
     description = "Modem control and terminal emulation program";
-    homepage = http://alioth.debian.org/projects/minicom/;
-
-    longDescription =
-      '' Minicom is a menu driven communications program.  It emulates ANSI
-         and VT102 terminals.  It has a dialing directory and auto zmodem
-         download.
-      '';
-
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    homepage = https://alioth.debian.org/projects/minicom/;
+    license = licenses.gpl2;
+    longDescription = ''
+      Minicom is a menu driven communications program.  It emulates ANSI
+      and VT102 terminals.  It has a dialing directory and auto zmodem
+      download.
+    '';
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch
new file mode 100644
index 00000000000..18535253d9f
--- /dev/null
+++ b/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch
@@ -0,0 +1,79 @@
+diff --git a/src/xminicom b/src/xminicom
+index a59aa08..cef153b 100755
+--- a/src/xminicom
++++ b/src/xminicom
+@@ -7,57 +7,39 @@
+ #
+ # version	$Id: xminicom,v 1.4 2008-06-09 20:48:35 al-guest Exp $
+
+-findcmd()
+-{
+-  IFS=:
+-  for i in $PATH
+-  do
+-	if [ -x $i\/$1 ]
+-	then
+-		result=$i\/$1
+-		IFS=
+-		return 0
+-	fi
+-  done
+-  result=
+-  IFS=
+-  return 1
++findcmd() {
++  result=$(command -v $1)
+ }
+
+-if findcmd x-terminal-emulator
+-then
++if findcmd x-terminal-emulator ; then
+   exec $result -T minicom -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+   exit 1
+ fi
+
+-if findcmd color_xterm
+-then
++if findcmd konsole ; then
++  exec $result -T minicom -geometry 80x25 -e minicom -m -c on "$@"
++  exit 1
++fi
++
++if findcmd gnome-terminal ; then
++  exec $result -T minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
++  exit 1
++fi
++
++if findcmd color_xterm ; then
+   exec $result -T minicom -bg black -fg grey -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+   exit 1
+ fi
+
+-if findcmd rxvt
+-then
++if findcmd rxvt ; then
+   exec $result -bg black -fg grey -n minicom -T minicom -sl 0 -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+   exit 1
+ fi
+
+-if findcmd kterm
+-then
++if findcmd xterm ; then
+   exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+   exit 1
+ fi
+
+-if findcmd xterm
+-then
+-  if [ -f /etc/debian_version ]
+-  then
+-  exec $result -T minicom -n minicom -bg black -fg grey -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+-  else
+-  exec $result -T minicom -n minicom -geometry 80x25 -e "if ! minicom -m -c on $*; then echo Press ENTER to continue...; read; fi"
+-  fi
+-  exit 1
+-fi
+-
+-echo "xminicom: rxvt, color_xterm or xterm NOT found!" 1>&2
++echo "xminicom: konsole, gnome-terminal, rxvt, color_xterm or xterm NOT found!" 1>&2
+ exit 1

From f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Tue, 24 Oct 2017 11:29:17 +0100
Subject: [PATCH 81/97] awesomebump: do not override qmake build phases

then all the hacks are not necessary
---
 .../graphics/awesomebump/default.nix          | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index 0666788e3e3..f190b421b05 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,47 +1,49 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
 
-stdenv.mkDerivation {
-  name = "awesomebump-5.1";
 
-  src = fetchurl {
-    url = https://github.com/kmkolasinski/AwesomeBump/archive/Winx32v5.1.tar.gz;
-    sha256 = "04s0jj9gfw1rfr82ga2vw6x1jy00ca9p9s3hh31q3k5h6vg5ailn";
+let
+  version = "5.1";
+
+  src = fetchgit {
+    url = "https://github.com/kmkolasinski/AwesomeBump.git";
+    rev = "Winx32v${version}";
+    sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56";
+    fetchSubmodules = true;
   };
 
-  buildInputs = [ qtbase qtscript qtdeclarative flex bison gnutar ];
+  qtnproperty = stdenv.mkDerivation {
+    name = "qtnproperty";
+    inherit src;
+    sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+    buildInputs = [ qtscript qtbase qtdeclarative ];
+    nativeBuildInputs = [ qmake flex bison ];
+    postInstall = ''
+      install -D bin-linux/QtnPEG $out/bin/QtnPEG
+    '';
+  };
+in stdenv.mkDerivation rec {
+  name = "awesomebump-${version}";
+
+  inherit src;
+
+  buildInputs = [ qtbase qtscript qtdeclarative ];
 
   nativeBuildInputs = [ qmake makeWrapper ];
 
-  buildPhase = ''
-    cd Sources/utils/QtnProperty
-    tar xf "${fetchurl { url = "https://github.com/kmkolasinski/QtnProperty/archive/00e1a9a7cdf6fa84d1b0a35efe752bc2e4a6be1f.tar.gz"; sha256 = "0fdny0khm6jb5816d5xsijp26xrkz2ksz8w9pv1x4hf32l48s9yn"; } }"
-    mv QtnProperty-*/* .
-    rm -r QtnProperty-*
-    alias
-    $QMAKE Property.pro -r TOP_SRC_DIR=$(pwd)
-    make
-    cd ../../../
-    $QMAKE
-    make
-    cp -vr workdir/`cat workdir/current`/bin/AwesomeBump Bin
+  preBuild = ''
+    ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
   '';
 
-  installPhase =
-    ''
-      d=$out/libexec/AwesomeBump
-      mkdir -p $d $out/bin
-      cp Bin/AwesomeBump $d/
-      cp -prd Bin/Configs Bin/Core $d/
+  postInstall = ''
+    d=$out/libexec/AwesomeBump
 
-      # AwesomeBump expects to find Core and Configs in its current
-      # directory.
-      makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+    mkdir -p $d
+    cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/
+    cp -prd Bin/Configs Bin/Core $d/
+
+    # AwesomeBump expects to find Core and Configs in its current directory.
+    makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
         --run "cd $d"
-    '';
-
-  # RPATH in /tmp hack
-  preFixup = ''
-    rm -r $NIX_BUILD_TOP/__nix_qt5__
   '';
 
   meta = {

From 4663bfa40e48f2e4ed9de1ffb31a37dc45ef19c0 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 20 Oct 2017 18:36:37 +0200
Subject: [PATCH 82/97] opencv: 3.2.0 -> 3.3.0

Release notes: https://opencv.org/opencv-3-3.html

The contrib module cnn_3dobj is disabled because it fails to build.

The contrib module dnn_modern is disabled because it causes:
https://github.com/opencv/opencv_contrib/issues/823
---
 pkgs/development/libraries/opencv/3.x.nix | 196 ++++++++++++++--------
 1 file changed, 123 insertions(+), 73 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index ecb7bf78b20..e6cb75d3b3d 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip, zlib
+{ lib, stdenv
+, fetchurl, fetchFromGitHub
+, cmake, pkgconfig, unzip, zlib, pcre, hdf5, protobuf
+, config
 
 , enableJPEG      ? true, libjpeg
 , enablePNG       ? true, libpng
@@ -6,93 +9,129 @@
 , enableWebP      ? true, libwebp
 , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
 , enableJPEG2K    ? true, jasper
+, enableEigen     ? true, eigen
+, enableOpenblas  ? true, openblas
+
+, enableCuda      ? (config.cudaSupport or false), cudatoolkit
 
 , enableIpp       ? false
-, enableContrib   ? false, protobuf
+, enableContrib   ? false  #, caffe, glog, boost, google-gflags
 , enablePython    ? false, pythonPackages
 , enableGtk2      ? false, gtk2
 , enableGtk3      ? false, gtk3
 , enableFfmpeg    ? false, ffmpeg
 , enableGStreamer ? false, gst_all_1
-, enableEigen     ? true, eigen
-, enableOpenblas  ? true, openblas
-, enableCuda      ? false, cudatoolkit
 , enableTesseract ? false, tesseract, leptonica
+, enableDocs      ? false, doxygen, graphviz-nox
+
 , AVFoundation, Cocoa, QTKit
 }:
 
 let
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "0f59g0dvhp5xg1xa3r4lp351a7x0k03i77ylgcf69ns3y47qd16p";
+    sha256 = "0266kg337wij9rz602z5088jn2fq56aqpxxflf0fbh28kygchvk4";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
     rev    = version;
-    sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
-  };
-
-  # This fixes the build on macOS.
-  # See: https://github.com/opencv/opencv_contrib/pull/926
-  contribOSXFix = fetchpatch {
-    url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
-    sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
+    sha256 = "0qxdvzdszzlpsya1pn4d2r9z4j98isxrgk15a2wwa3dqjmgv880d";
   };
 
   # Contrib must be built in order to enable Tesseract support:
   buildContrib = enableContrib || enableTesseract;
 
-  vggFiles = fetchFromGitHub {
-    owner  = "opencv";
-    repo   = "opencv_3rdparty";
-    rev    = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
-    sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
+  # See opencv/3rdparty/ippicv/ippicv.cmake
+  ippicv = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "a62e20676a60ee0ad6581e217fe7e4bada3b95db";
+      sha256 = "04idycc479l7fidj6r107sv65iszndswm287ms3nh896jbpbaxbv";
+    } + "/ippicv";
+    files = let name = platform : "ippicv_2017u2_${platform}_20170418.tgz"; in
+      if stdenv.system == "x86_64-linux" then
+      { ${name "lnx_intel64"} = "87cbdeb627415d8e4bc811156289fa3a"; }
+      else if stdenv.system == "i686-linux" then
+      { ${name "lnx_ia32"}    = "f2cece00d802d4dea86df52ed095257e"; }
+      else if stdenv.system == "x86_64-darwin" then
+      { ${name "mac_intel64"} = "0c25953c99dbb499ff502485a9356d8d"; }
+      else
+      throw "ICV is not available for this platform (or not yet supported by this package)";
+    dst = ".cache/ippicv";
   };
 
-  bootdescFiles = fetchFromGitHub {
-    owner  = "opencv";
-    repo   = "opencv_3rdparty";
-    rev    = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
-    sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
+  # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
+  vgg = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
+      sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
+    };
+    files = {
+      "vgg_generated_48.i"  = "e8d0dcd54d1bcfdc29203d011a797179";
+      "vgg_generated_64.i"  = "7126a5d9a8884ebca5aea5d63d677225";
+      "vgg_generated_80.i"  = "7cd47228edec52b6d82f46511af325c5";
+      "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
+    };
+    dst = ".cache/xfeatures2d/vgg";
+  };
+
+  # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
+  boostdesc = {
+    src = fetchFromGitHub {
+      owner  = "opencv";
+      repo   = "opencv_3rdparty";
+      rev    = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
+      sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
+    };
+    files = {
+      "boostdesc_bgm.i"          = "0ea90e7a8f3f7876d450e4149c97c74f";
+      "boostdesc_bgm_bi.i"       = "232c966b13651bd0e46a1497b0852191";
+      "boostdesc_bgm_hd.i"       = "324426a24fa56ad9c5b8e3e0b3e5303e";
+      "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
+      "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
+      "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
+      "boostdesc_lbgm.i"         = "0ae0675534aa318d9668f2a179c2a052";
+    };
+    dst = ".cache/xfeatures2d/boostdesc";
+  };
+
+  installExtraFiles = extra : with lib; ''
+    mkdir -p "${extra.dst}"
+  '' + concatStrings (mapAttrsToList (name : md5 : ''
+    ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
+  '') extra.files);
+
+  # See opencv_contrib/modules/dnn_modern/CMakeLists.txt
+  tinyDnn = rec {
+    src = fetchurl {
+      url    = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}";
+      sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2";
+    };
+    name = "v1.0.0a3.tar.gz";
+    md5  = "adb1c512e09ca2c7a6faef36f9c53e59";
+    dst  = ".cache/tiny_dnn";
   };
 
   opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}";
+
 in
 
 stdenv.mkDerivation rec {
   name = "opencv-${version}";
   inherit version src;
 
-  postUnpack =
-    (lib.optionalString buildContrib ''
-      cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
-
-      # This fixes the build on macOS.
-      patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
-
-      for name in vgg_generated_48.i \
-                  vgg_generated_64.i \
-                  vgg_generated_80.i \
-                  vgg_generated_120.i; do
-        ln -s "${vggFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name"
-      done
-
-      for name in boostdesc_bgm.i          \
-                  boostdesc_bgm_bi.i       \
-                  boostdesc_bgm_hd.i       \
-                  boostdesc_binboost_064.i \
-                  boostdesc_binboost_128.i \
-                  boostdesc_binboost_256.i \
-                  boostdesc_lbgm.i; do
-        ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name"
-      done
-    '');
+  postUnpack = lib.optionalString buildContrib ''
+    cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
+  '';
 
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
@@ -105,29 +144,19 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =
-    (let version  = "20151201";
-         md5      = "808b791a6eac9ed78d32a7666804320e";
-         sha256   = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3";
-         rev      = "81a676001ca8075ada498583e4166079e5744668";
-         platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
-                    else throw "ICV is not available for this platform (or not yet supported by this package)";
-         name = "ippicv_${platform}_${version}.tgz";
-         ippicv = fetchurl {
-           url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}";
-           inherit sha256;
-         };
-         dir = "3rdparty/ippicv/downloads/${platform}-${md5}";
-     in lib.optionalString enableIpp ''
-          mkdir -p "${dir}"
-          ln -s "${ippicv}" "${dir}/${name}"
-        ''
-    ) +
-    (lib.optionalString buildContrib ''
+    installExtraFiles ippicv + (
+    lib.optionalString buildContrib ''
       cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
+
+      ${installExtraFiles vgg}
+      ${installExtraFiles boostdesc}
+
+      mkdir -p "${tinyDnn.dst}"
+      ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}"
     '');
 
   buildInputs =
-       [ zlib ]
+       [ zlib pcre hdf5 protobuf ]
     ++ lib.optional enablePython pythonPackages.python
     ++ lib.optional enableGtk2 gtk2
     ++ lib.optional enableGtk3 gtk3
@@ -146,8 +175,13 @@ stdenv.mkDerivation rec {
     # tesseract & leptonica.
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optional enableCuda cudatoolkit
-    ++ lib.optional buildContrib protobuf
-    ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
+
+    # These are only needed for the currently disabled
+    # cnn_3dobj and dnn_modern modules
+    # ++ lib.optionals buildContrib [ caffe glog boost google-gflags ]
+
+    ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]
+    ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
 
@@ -156,7 +190,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
   cmakeFlags = [
-    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON"
+    "-DBUILD_PROTOBUF=OFF"
+    "-DPROTOBUF_UPDATE_FILES=ON"
+    "-DWITH_OPENMP=ON"
+    (opencvFlag "IPP" enableIpp)
     (opencvFlag "TIFF" enableTIFF)
     (opencvFlag "JASPER" enableJPEG2K)
     (opencvFlag "WEBP" enableWebP)
@@ -168,11 +205,24 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableCuda [
     "-DCUDA_FAST_MATH=ON"
     "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"
-  ] ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off"
+  ] ++ lib.optionals buildContrib [
+         # the cnn_3dobj module fails to build
+         "-DBUILD_opencv_cnn_3dobj=OFF"
+
+         # the dnn_modern module causes:
+         # https://github.com/opencv/opencv_contrib/issues/823
+         #
+         # On OS X its dependency tiny-dnn-1.0.0a3 also fails to build.
+         "-DBUILD_opencv_dnn_modern=OFF"
+       ]
     ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"];
 
   enableParallelBuilding = true;
 
+  postBuild = lib.optionalString enableDocs ''
+    make doxygen
+  '';
+
   hardeningDisable = [ "bindnow" "relro" ];
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
@@ -181,7 +231,7 @@ stdenv.mkDerivation rec {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric mdaiter];
+    maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 5715f276da428b17200e922003731cf89a4620d4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 23 Oct 2017 23:10:06 +0200
Subject: [PATCH 83/97] shotwell: 0.26.2 -> 0.27.0

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3f31b86fe49..a3be867d6ed 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  major = "0.26";
-  minor = "2";
+  major = "0.27";
+  minor = "0";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag";
+    sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

From 826258889e0611298a4fded1e7712e7de6af2680 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 10:55:01 +0200
Subject: [PATCH 84/97] webkitgtk217x: remove, unused

---
 pkgs/development/libraries/webkitgtk/2.17.nix | 108 ------------------
 pkgs/top-level/all-packages.nix               |   5 -
 2 files changed, 113 deletions(-)
 delete mode 100644 pkgs/development/libraries/webkitgtk/2.17.nix

diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix
deleted file mode 100644
index fc0e13436bc..00000000000
--- a/pkgs/development/libraries/webkitgtk/2.17.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
-, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
-, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
-, libidn, libedit, readline, mesa, libintlOrEmpty
-, enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base, gst-plugins-bad
-}:
-
-assert enableGeoLocation -> geoclue2 != null;
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
-  version = "2.17.91";
-
-  meta = {
-    description = "Web content rendering engine, GTK+ port";
-    homepage = http://webkitgtk.org/;
-    license = licenses.bsd2;
-    platforms = with platforms; linux ++ darwin;
-    hydraPlatforms = [];
-    maintainers = with maintainers; [ ];
-  };
-
-  postConfigure = optionalString stdenv.isDarwin ''
-    substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
-        --replace "../../lib/libWTFGTK.a" ""
-    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
-        --replace "../../lib/libbmalloc.a" ""
-    sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
-        Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
-        Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
-        Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
-        Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
-        Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
-        Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
-        Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
-    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
-        --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
-  '';
-
-  src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0f158gqb2lvv3v5z6s7gjgwms69fgsjkd8whfks8cq6cybiy9y37";
-  };
-
-  # see if we can clean this up....
-
-  patches = [  
-    ./finding-harfbuzz-icu.patch
-    ./gstreamergl-2.17.patch
-  ] ++ optionals stdenv.isDarwin [
-    ./PR-152650-2.patch
-    ./PR-153138.patch
-    ./PR-157554.patch
-    ./PR-157574.patch
-  ];
-
-  cmakeFlags = [
-  "-DPORT=GTK"
-  "-DUSE_LIBHYPHEN=0"
-  ]
-  ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
-  ++ optionals stdenv.isDarwin [
-  "-DUSE_SYSTEM_MALLOC=ON"
-  "-DUSE_ACCELERATE=0"
-  "-DENABLE_INTROSPECTION=ON"
-  "-DENABLE_MINIBROWSER=OFF"
-  "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
-  "-DENABLE_MINIBROWSER=OFF"
-  "-DENABLE_VIDEO=ON"
-  "-DENABLE_QUARTZ_TARGET=ON"
-  "-DENABLE_X11_TARGET=OFF"
-  "-DENABLE_OPENGL=OFF"
-  "-DENABLE_WEB_AUDIO=OFF"
-  "-DENABLE_WEBGL=OFF"
-  "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
-  "-DENABLE_GTKDOC=OFF"
-  ];
-
-  # XXX: WebKit2 missing include path for gst-plugins-base.
-  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
-                     + (optionalString stdenv.isDarwin " -lintl");
-
-  nativeBuildInputs = [
-    cmake perl python2 ruby bison gperf sqlite
-    pkgconfig gettext gobjectIntrospection
-  ];
-
-  buildInputs = libintlOrEmpty ++ [
-    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
-    gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
-  ] ++ optional enableGeoLocation geoclue2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ])
-    ++ optionals stdenv.isDarwin [ libedit readline mesa ]
-    ++ optional stdenv.isLinux wayland;
-
-  propagatedBuildInputs = [
-    libsoup gtk3
-  ];
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "dev" ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4d920ee651..cf0bb3f9224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10956,11 +10956,6 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix {
-    harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
-
   webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
     withGtk2 = true;
     enableIntrospection = false;

From 8e5a5904c1be7ec104aedc6991e85369d785c81b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 20 Oct 2017 00:58:02 +0200
Subject: [PATCH 85/97] prometheus-blackbox-exporter: 0.9.1 -> 0.10.0

---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 6521408580d..c5aa7f91bd6 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.9.1";
+  version = "0.10.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "03sc1h8jfxaw7c5d6lkj6x653zhxhh0v29n6db3319nsfx00nrag";
+    sha256 = "0xxlmg6yin63pghlvjj8amf0h5plnichvcrmcq67bffhz6d792gc";
   };
 
   meta = with stdenv.lib; {

From de917326a902e6adbe7a966ee4351010520575bf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 20 Oct 2017 01:55:56 +0200
Subject: [PATCH 86/97] atlassian-crowd service: run crowd in foreground

---
 nixos/modules/services/web-apps/atlassian/crowd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index b54c91d7de9..2a5f0804638 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -142,7 +142,7 @@ in
           ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
       '';
 
-      script = "${pkg}/start_crowd.sh";
+      script = "${pkg}/start_crowd.sh -fg";
 
       serviceConfig = {
         User = cfg.user;

From 9cad02ce6b26837a9498df833baaec2363110d28 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 20 Oct 2017 00:56:17 +0200
Subject: [PATCH 87/97] journalbeat: set argv0 in wrapper

---
 pkgs/tools/system/journalbeat/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index 5d60f4c7c5c..b914ffaa0cb 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -15,6 +15,7 @@ in buildGoPackage rec {
 
   postInstall = ''
     wrapProgram $bin/bin/journalbeat \
+      --argv0 journalbeat \
       --prefix LD_LIBRARY_PATH : ${libPath}
   '';
 

From 422fd6a2aa5f346e43090cacb846214cb005d2e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 13:21:33 +0200
Subject: [PATCH 88/97] prometheus: 1.7.2 -> 1.8.1

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

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 08ee6b4e88a..46c02c6bb95 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "1.7.2";
+  version = "1.8.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "0a2qlcx4p6mwgff9hc2h3sm1glh6syb38jfxabsx2clmj0gq2dq1";
+    sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
   };
 
   docheck = true;

From 17a069276faec303d173aa5ef23cf95ea5233690 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 12:27:20 +0200
Subject: [PATCH 89/97] libvirt: 3.6.0 -> 3.8.0

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 86e858e569c..ff72cc84d26 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "3.6.0";
+  version = "3.8.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s";
+    sha256 = "1y83z4jb2by6ara0nw4sivh7svqcrw97yfhqwdscxl4y10saisvk";
   };
 
   patches = [ ./build-on-bsd.patch ];

From b4d1c8898ef80db2a878055f08c38e3e2ebbd3d9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 13:10:42 +0200
Subject: [PATCH 90/97] sks: build with default db version

---
 pkgs/servers/sks/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index 1d3b04565c8..fe4029db1c1 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }:
+{ stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }:
 
 stdenv.mkDerivation rec {
   name = "sks-${version}";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
   };
 
-  buildInputs = [ ocaml zlib db48 perl camlp4 ];
+  buildInputs = [ ocaml zlib db perl camlp4 ];
 
   makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
   preConfigure = ''
     cp Makefile.local.unused Makefile.local
     sed -i \
-      -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
+      -e "s:^LIBDB=.*$:LIBDB=-ldb:g" \
       Makefile.local
   '';
 
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
   checkPhase = "./sks unit_test";
 
   meta = with stdenv.lib; {
-    description = "An OpenPGP keyserver whose goal is to provide easy to
-      deploy, decentralized, and highly reliable synchronization";
+    description = "An easily deployable & decentralized OpenPGP keyserver";
     longDescription = ''
       SKS is an OpenPGP keyserver whose goal is to provide easy to deploy,
       decentralized, and highly reliable synchronization. That means that a key
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ primeos fpletz ];
   };
 }
 

From a203fd2a57e828bcf567928ff41361fc52bc8e9b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 13:25:16 +0200
Subject: [PATCH 91/97] SDL_image: add patch to fix CVE-2017-2887

---
 pkgs/development/libraries/SDL_image/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 62af47807cc..55a4058fe56 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
+{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   name = "SDL_image-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-2887";
+      url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c";
+      sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv";
+    })
+  ];
+
   buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
 
   meta = with stdenv.lib; {

From 97b23fc9755e284399b62f5c162be6d3ab872dad Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 13:52:51 +0200
Subject: [PATCH 92/97] softhsm: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 42b6024fb21..6caf88973a6 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "1xw53zkv5xb9pxa8q84kh505yd6pkavxd12x2fjgqi6s12p2hsgb";
+    sha256 = "09y1ladg7j0j5n780b1hdzwd2g2b5j5c54pfs7bzjviskb409mjy";
   };
 
   configureFlags = [

From 2f5038535280c06d14ba4efa05b8bef94b3d385c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 14:16:12 +0200
Subject: [PATCH 93/97] botanUnstable: remove, unused

---
 pkgs/development/libraries/botan/unstable.nix      |  9 ---------
 pkgs/development/libraries/botan/unstable.upstream | 10 ----------
 pkgs/top-level/all-packages.nix                    |  1 -
 3 files changed, 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/botan/unstable.nix
 delete mode 100644 pkgs/development/libraries/botan/unstable.upstream

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
deleted file mode 100644
index 6ae151dcc64..00000000000
--- a/pkgs/development/libraries/botan/unstable.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  baseVersion = "1.11";
-  revision = "34";
-  sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar";
-  openssl = null;
-  postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
-})
diff --git a/pkgs/development/libraries/botan/unstable.upstream b/pkgs/development/libraries/botan/unstable.upstream
deleted file mode 100644
index c03bc7a6c3b..00000000000
--- a/pkgs/development/libraries/botan/unstable.upstream
+++ /dev/null
@@ -1,10 +0,0 @@
-url http://botan.randombit.net/download.html
-version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
-ensure_version
-attribute_name botanUnstable
-do_overwrite(){
-  ensure_hash
-  set_var_value sha256 $CURRENT_HASH
-  set_var_value baseVersion ${CURRENT_VERSION%.*}
-  set_var_value revision ${CURRENT_VERSION##*.}
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf0bb3f9224..d1d5a5ae30c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7818,7 +7818,6 @@ with pkgs;
 
   botan = callPackage ../development/libraries/botan { };
   botan2 = callPackage ../development/libraries/botan/2.0.nix { };
-  botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
 
   box2d = callPackage ../development/libraries/box2d { };
 

From acc8d160f0c8a4f7a7c6d8f3b6f5856ee735acbb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 14:19:16 +0200
Subject: [PATCH 94/97] botan2: 2.0.1 -> 2.3.0 for CVE-2017-14737

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

diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
index 8d87f119157..dec08d17177 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -1,9 +1,9 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  baseVersion = "2.0";
-  revision = "1";
-  sha256 = "02sf6qghgs1lmprx715dnyll1rmqcjb9q6s50n20li8idlqysf51";
+  baseVersion = "2.3";
+  revision = "0";
+  sha256 = "0z6lwv28hxnfkhd4s03cb4cdm1621bsswc2h88z4qslqwpz71y9r";
   postPatch = ''
     sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
   '';

From d72ae07c24bbeaccb0b959f539dafdd39bfad60b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 14:19:38 +0200
Subject: [PATCH 95/97] botan: 1.10.15 -> 1.10.17 for CVE-2017-14737

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

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index f2971cc47be..04652aa013a 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "15";
-  sha256 = "1zkhmggzxjla2iwaiyrx5161yxckrzszmy9yghjlpnhg8zyqzk60";
+  revision = "17";
+  sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
   extraConfigureFlags = "--with-gnump";
   postPatch = ''
     sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt

From a502a95616b6704cc73d05a63f0f2f8596de7991 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 14:20:00 +0200
Subject: [PATCH 96/97] kea: build with botan2

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

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index e1829bcaf7d..68fb72ff7d9 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus
 , boost, python3, postgresql, mysql, gmp, bzip2 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--localstatedir=/var"
-    "--with-botan-config=${botan}/bin/botan-config-1.10"
     "--with-dhcp-pgsql=${postgresql}/bin/pg_config"
     "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"
   ];
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
     openssl log4cplus boost python3 mysql.client
-    botan gmp bzip2
+    botan2 gmp bzip2
   ];
 
   enableParallelBuilding = true;

From 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Oct 2017 14:32:33 +0200
Subject: [PATCH 97/97] wireshark: 2.4.1 -> 2.4.2 for multiple CVEs

Fixes CVE-2017-15192, CVE-2017-15193, CVE-2017-15191, CVE-2017-15190,
CVE-2017-15189.

See https://www.wireshark.org/docs/relnotes/wireshark-2.4.2.html.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 4844c83cd14..2ed87c71a90 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.4.1";
+  version = "2.4.2";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82";
+    sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i";
   };
 
   cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";