diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 981ed156b34..3482ae16e26 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@
     on non-NixOS)
 - Built on platform(s)
    - [ ] NixOS
-   - [ ] OS X
+   - [ ] macOS
    - [ ] Linux
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6ff64599540..cf996b6c32d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -187,7 +187,6 @@
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   hce = "Hans-Christian Esperer <hc@hcesperer.org>";
   henrytill = "Henry Till <henrytill@gmail.com>";
-  hiberno = "Christian Lask <hiberno@hiberno.net>";
   hinton = "Tom Hinton <t@larkery.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
@@ -360,6 +359,7 @@
   rardiol = "Ricardo Ardissone <ricardo.ardissone@gmail.com>";
   rasendubi = "Alexey Shmalko <rasen.dubi@gmail.com>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
+  rbasso = "Rafael Basso <rbasso@sharpgeeks.net>";
   redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
   redvers = "Redvers Davies <red@infect.me>";
   refnil = "Martin Lavoie <broemartino@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 61596265124..08d73970408 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -61,6 +61,7 @@
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
+  ./programs/adb.nix
   ./programs/atop.nix
   ./programs/bash/bash.nix
   ./programs/blcr.nix
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
new file mode 100644
index 00000000000..9ba81899e58
--- /dev/null
+++ b/nixos/modules/programs/adb.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.mic92 ];
+
+  ###### interface
+  options = {
+    programs.adb = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Whether to configure system to use Android Debug Bridge (adb).
+          To grant access to a user, it must be part of adbusers group:
+          <code>users.extraUsers.alice.extraGroups = ["adbusers"];</code>
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.programs.adb.enable {
+    services.udev.packages = [ pkgs.android-udev-rules ];
+    environment.systemPackages = [ pkgs.androidenv.platformTools ];
+    users.extraGroups.adbusers = {};
+  };
+}
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 4145f8fa957..277fc9a3902 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -9,11 +9,15 @@ let
   mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
   fromBool = x: if x then "true" else "false";
   configFile = pkgs.writeText "homeserver.yaml" ''
+${optionalString (cfg.tls_certificate_path != null) ''
 tls_certificate_path: "${cfg.tls_certificate_path}"
+''}
 ${optionalString (cfg.tls_private_key_path != null) ''
 tls_private_key_path: "${cfg.tls_private_key_path}"
 ''}
+${optionalString (cfg.tls_dh_params_path != null) ''
 tls_dh_params_path: "${cfg.tls_dh_params_path}"
+''}
 no_tls: ${fromBool cfg.no_tls}
 ${optionalString (cfg.bind_port != null) ''
 bind_port: ${toString cfg.bind_port}
@@ -146,8 +150,9 @@ in {
         '';
       };
       tls_certificate_path = mkOption {
-        type = types.str;
-        default = "/var/lib/matrix-synapse/homeserver.tls.crt";
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/matrix-synapse/homeserver.tls.crt";
         description = ''
           PEM encoded X509 certificate for TLS.
           You can replace the self-signed certificate that synapse
@@ -158,16 +163,17 @@ in {
       };
       tls_private_key_path = mkOption {
         type = types.nullOr types.str;
-        default = "/var/lib/matrix-synapse/homeserver.tls.key";
-        example = null;
+        default = null;
+        example = "/var/lib/matrix-synapse/homeserver.tls.key";
         description = ''
           PEM encoded private key for TLS. Specify null if synapse is not
           speaking TLS directly.
         '';
       };
       tls_dh_params_path = mkOption {
-        type = types.str;
-        default = "/var/lib/matrix-synapse/homeserver.tls.dh";
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/matrix-synapse/homeserver.tls.dh";
         description = ''
           PEM dh parameters for ephemeral keys
         '';
@@ -557,12 +563,10 @@ in {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        if ! test -e /var/lib/matrix-synapse; then
-          mkdir -p /var/lib/matrix-synapse
-          chmod 700 /var/lib/matrix-synapse
-          chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse
-          ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys
-        fi
+        ${cfg.package}/bin/homeserver \
+          --config-path ${configFile} \
+          --keys-directory /var/lib/matrix-synapse \
+          --generate-keys
       '';
       serviceConfig = {
         Type = "simple";
@@ -570,7 +574,7 @@ in {
         Group = "matrix-synapse";
         WorkingDirectory = "/var/lib/matrix-synapse";
         PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}";
+        ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse";
       };
     };
   };
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index 0844190a549..ab1b5406877 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -91,7 +91,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}";
+        User = "nobody";
+        ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
       };
     };
 
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 5e15e40ea0c..7e981183353 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -36,7 +36,7 @@ let
       echo \'\'
       ${concatStringsSep "\n" (mapAttrsToList (k: v:
           optionalString (v.hostname != "")
-            "echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}")
+            "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
           (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
       echo \'\'
     '');
@@ -245,7 +245,10 @@ in
       serviceConfig = {
         Type = "forking";
         Restart = "on-failure";
-
+        CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
+        AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
+        ProtectSystem = "full";
+        MemoryDenyWriteExecute = true;
         ProtectHome = true;
         PrivateTmp = true;
       };
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 99269c49e8f..3f0906fdb80 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -3,8 +3,8 @@
 with lib;
 
 let
-  quassel = pkgs.kde4.quasselDaemon;
   cfg = config.services.quassel;
+  quassel = cfg.package;
   user = if cfg.user != null then cfg.user else "quassel";
 in
 
@@ -23,6 +23,15 @@ in
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.kde4.quasselDaemon;
+        description = ''
+          The package of the quassel daemon.
+        '';
+        example = pkgs.quasselDaemon;
+      };
+
       interfaces = mkOption {
         default = [ "127.0.0.1" ];
         description = ''
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 0c1f8d8cdb9..005655f111a 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -221,7 +221,7 @@ in
         type = types.string;
         default = ''
           + FPing
-          binary = ${pkgs.fping}/bin/fping
+          binary = ${config.security.wrapperDir}/fping
         '';
         description = "Probe configuration";
       };
@@ -284,10 +284,10 @@ in
         mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
         rm -f ${smokepingHome}/cropper
         ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
-        chown -R ${cfg.user} ${smokepingHome}
         cp ${cgiHome} ${smokepingHome}/smokeping.fcgi
         ${cfg.package}/bin/smokeping --check --config=${configPath}
         ${cfg.package}/bin/smokeping --static --config=${configPath}
+        chown -R ${cfg.user} ${smokepingHome}
       '';
       script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon'';
     };
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 7ec484941ed..deff645d9bf 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -100,6 +100,10 @@ let
         seccomp_sandbox=NO
       ''}
       anon_umask=${cfg.anonymousUmask}
+      ${optionalString cfg.anonymousUser ''
+        anon_root=${cfg.anonymousUserHome}
+      ''}
+      ${cfg.extraConfig}
     '';
 
 in
@@ -163,6 +167,13 @@ in
         description = "Anonymous write umask.";
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = "ftpd_banner=Hello";
+        description = "Extra configuration to add at the bottom of the generated configuration file.";
+      };
+
     } // (listToAttrs (catAttrs "nixosOption" optionDescription));
 
   };
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 676e82aa893..76ba78ff366 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -208,11 +208,10 @@ in
 
         networks = mkOption {
           default = { };
-          type = types.loaOf types.optionSet;
+          type = with types; loaOf (submodule networkOpts);
           description = ''
             IRC networks to connect the user to.
           '';
-          options = [ networkOpts ];
           example = {
             "freenode" = {
               server = "chat.freenode.net";
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index ea503a9526f..5f669dee754 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -123,7 +123,7 @@ in {
         # config file. But this path can unfortunately be garbage collected
         # while still being used by the virtual machine. So update the
         # emulator path on each startup to something valid (re-scan $PATH).
-        for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do
+        for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
             test -f "$file" || continue
             # get (old) emulator path from config file
             emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index f61c82b916a..1cedf168dcb 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -57,6 +57,7 @@ import ./make-test.nix ({ pkgs, ...} : {
                   connectTo."192.168.0.1:1024}" =
                     { password = carolPassword;
                       publicKey = carolPubKey;
+                      hostname = "carol";
                     };
                 };
             };
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 787929f8904..7616a75b021 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: {
 
       networking.firewall.allowedTCPPorts = [ 4444 ];
 
-      systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444";
+      systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444";
     };
 
     probe = { config, lib, pkgs, ...}: {
@@ -36,7 +36,7 @@ import ./make-test.nix (pkgs: {
       $machine->waitForShutdown;
       $machine->start;
       $probe->waitForUnit("network.target");
-      $probe->waitUntilSucceeds("echo test | nc -c machine 4444");
+      $probe->waitUntilSucceeds("echo test | nc machine 4444");
     '';
 
 })
diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix
deleted file mode 100644
index a28e41deb31..00000000000
--- a/nixos/tests/mpich.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-# Simple example to showcase distributed tests using NixOS VMs.
-
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "mpich";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eelco chaoflow ];
-  };
-
-  nodes = {
-    master =
-      { config, pkgs, ... }: {
-        environment.systemPackages = [ gcc mpich2 ];
-        #boot.kernelPackages = pkgs.kernelPackages_2_6_29;
-      };
-
-    slave =
-      { config, pkgs, ... }: {
-        environment.systemPackages = [ gcc mpich2 ];
-      };
-  };
-
-  # Start master/slave MPI daemons and compile/run a program that uses both
-  # nodes.
-  testScript =
-    ''
-       startAll;
-
-       $master->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
-       $master->succeed("chmod 600 /etc/mpd.conf");
-       $master->succeed("mpd --daemon --ifhn=master --listenport=4444");
-
-       $slave->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
-       $slave->succeed("chmod 600 /etc/mpd.conf");
-       $slave->succeed("mpd --daemon --host=master --port=4444");
-
-       $master->succeed("mpicc -o example -Wall ${./mpich-example.c}");
-       $slave->succeed("mpicc -o example -Wall ${./mpich-example.c}");
-
-       $master->succeed("mpiexec -n 2 ./example >&2");
-    '';
-})
diff --git a/nixos/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh
deleted file mode 100755
index 1ba2f841c41..00000000000
--- a/nixos/tests/test-config-examples.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# This script try to evaluate all configurations which are stored in
-# doc/config-examples.  This script is useful to ensure that examples are
-# working with the current system.
-
-pwd=$(pwd)
-set -xe
-for i in ../doc/config-examples/*.nix; do
-  NIXOS_CONFIG="$pwd/$i" nix-instantiate \
-      --eval-only --xml --strict > /dev/null 2>&1 \
-      ../default.nix -A system
-done
-set +xe
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 02a8fc68028..376c4f21dc0 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -299,9 +299,9 @@ let
       -pf /run/dhclient.pid \
       -v eth0 eth1
 
-    otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)"
+    otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)"
     ${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP"
-    echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || :
+    echo "$otherIP reachable" | ${pkgs.netcat}/bin/nc -l 5678 || :
   '';
 
   sysdDetectVirt = pkgs: ''
@@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest {
     my $test1IP = waitForIP_test1 1;
     my $test2IP = waitForIP_test2 1;
 
-    $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
-    $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
+    $machine->succeed("echo '$test2IP' | nc '$test1IP' 1234");
+    $machine->succeed("echo '$test1IP' | nc '$test2IP' 1234");
 
-    $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
-    $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
+    $machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2");
+    $machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2");
 
     shutdownVM_test1;
     shutdownVM_test2;
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 40d82914bf7..c6490cf67df 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  core_version = "0.13.0";
+  core_version = "0.13.1";
   version = core_version;
 
   src = fetchurl {
     urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
              "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda";
+    sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 95f86ad60ad..39946fd5c7d 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -4,13 +4,13 @@
 
 let
 
-  version = "1.3.2";
+  version = "1.3.3";
 
   airwave-src = fetchFromGitHub {
     owner = "phantom-code";
     repo = "airwave";
     rev = version;
-    sha256 = "053kkx5yq1vas0qisidkgq0h6hzfwy3677jprjkcrwc4hp2i2v12";
+    sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
   };
 
   stdenv_multi = overrideCC stdenv gcc_multi;
@@ -60,6 +60,9 @@ stdenv_multi.mkDerivation {
   # shrinking.
   dontPatchELF = true;
 
+  # Cf. https://github.com/phantom-code/airwave/issues/57
+  hardeningDisable = [ "format" ];
+
   cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}";
 
   postInstall = ''
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index b7ea32cd1d4..ab228766e13 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./tools/
   '';
 
-  configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
+  configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out";
 
   buildPhase = "${python2.interpreter} waf";
 
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 3488d8fb38f..04f0f9d3025 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -34,6 +34,5 @@ stdenv.mkDerivation rec {
     description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
     license     = licenses.gpl3;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ hiberno ];
   };
 }
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e6287af497a..eaf02bd2689 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.10";
+  version = "0.9.11";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "142si734lsyywxhn7msiz053ir96kl5im3h1jql3vhcb4807f3d1";
+    sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf";
   };
 
   configureFlags = [ "--enable-lv2" ];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 7fdf1c34771..a14d642cd83 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.7.1";
+  version = "0.7.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4";
+    sha256 = "0cl1rbj26nsbvg9wzsh2j8xlx69xjxn29x46ypmy3939zbk81bi6";
   };
 
-  buildInputs = [ libjack2 libsndfile lv2 qt4 ];
+  buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
 
   meta = with stdenv.lib; {
     description = "An old-school drum-kit sampler synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 3ef69606c77..a546441996e 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
 stdenv.mkDerivation rec {
   name = "eq10q-${version}";
-  version = "2.0";
+  version = "2.1";
   src = fetchurl {
     url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
-    sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h";
+    sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880";
   };
 
   buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
new file mode 100644
index 00000000000..22944ffefe4
--- /dev/null
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
+stdenv.mkDerivation rec {
+  name = "fmsynth-unstable-${version}";
+  version = "2015-02-07";
+  src = fetchFromGitHub {
+    owner = "Themaister";
+    repo = "libfmsynth";
+    rev = "9ffa1d2fea287f1209b210d2dbde2f0f60f37176";
+    sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
+  };
+
+  buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ];
+
+  buildPhase = ''
+    cd lv2
+    substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2"
+    make
+  '';
+
+  preInstall = "mkdir -p $out/lib/lv2";
+
+  meta = {
+    description = "a flexible 8 operator FM synthesizer for LV2";
+    longDescription = ''
+      The synth core supports:
+
+      - Arbitrary amounts of polyphony
+      - 8 operators
+      - No fixed "algorithms"
+      - Arbitrary modulation, every operator can modulate any other operator, even itself
+      - Arbitrary carrier selection, every operator can be a carrier
+      - Sine LFO, separate LFO per voice, modulates amplitude and frequency of operators
+      - Envelope per operator
+      - Carrier stereo panning
+      - Velocity sensitivity per operator
+      - Mod wheel sensitivity per operator
+      - Pitch bend
+      - Keyboard scaling
+      - Sustain, sustained keys can overlap each other for a very rich sound
+      - Full floating point implementation optimized for SIMD
+      - Hard real-time constraints
+    '';
+    homepage = https://github.com/Themaister/libfmsynth;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 4fd68742ba2..e0bca0fa1c8 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.35.1";
+  version = "0.35.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6";
+    sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index b4cf0288672..712f309fad0 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,15 +1,16 @@
-  { stdenv, fetchurl, xorg, freetype, alsaLib, libjack2
+  { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2
   , lv2, pkgconfig, mesa }:
 
   stdenv.mkDerivation rec {
-  version = "0.6.1";
+  version = "0.8.6";
   name = "helm-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/mtytel/helm/archive/v${version}.tar.gz";
-    sha256 = "18d7zx6r7har47zj6x1f2z91x796mxnix7w3x1yilmqnyqc56r3w";
-    };
-
+  src = fetchFromGitHub {
+    owner = "mtytel";
+    repo = "helm";
+    rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489";
+    sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8";
+  };
 
   buildInputs = [
     xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
@@ -17,11 +18,18 @@
     freetype alsaLib libjack2 pkgconfig mesa lv2
   ];
 
+  CXXFLAGS = "-DHAVE_LROUND";
+
+  patchPhase = ''
+    sed -i 's|usr/||g' Makefile
+  '';
+
+  buildPhase = ''
+    make lv2
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/lib/lv2
-    cp -a standalone/builds/linux/build/* $out/bin
-    cp -a builds/linux/LV2/* $out/lib/lv2/
+   make DESTDIR="$out" install
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 6c53d1fe755..31185c0d0c2 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage    = http://www.musicpd.org/clients/ncmpc/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hiberno ];
     platforms   = platforms.all;
   };
 }
-
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 56db4e8352e..fa25a474c1d 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/cdemoulins/pamixer;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ hiberno ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index db73901d2aa..c84e5cdfb49 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.3";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g";
+    sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     qt5.full
     qt5.qtx11extras
-    alsaLib 
+    alsaLib
     libjack2
-    dbus 
+    dbus
   ];
 
   configureFlags = "--enable-jack-version";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index fa9df2f603e..aeb8396e0a6 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.7.1";
+  version = "0.7.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq";
+    sha256 = "071j7mi2cwhx0ml5hq8izmjb0s4yhbkscqaxfdg56xfpfsqsa63l";
   };
 
-  buildInputs = [ libjack2 libsndfile lv2 qt4 ];
+  buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
 
   meta = with stdenv.lib; {
     description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index ab1ba242cfd..faa895e2e30 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
+{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "swh-lv2-git-2013-05-17";
+  name = "swh-lv2-v${version}";
+  version = "1.0.16";
 
-  src = fetchgit {
-    url = "https://github.com/swh/lv2.git";
-    rev = "978d5d8f549fd22048157a6d044af0faeaacbd7f";
-    sha256 = "10jj8sp67caxvmzjxwyzapc34jpry5nrkkp49kyyvyk5dgkpbsjw";
+  src = fetchurl {
+    url = "https://github.com/swh/lv2/archive/v${version}.tar.gz";
+    sha256 = "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 43003782f2f..4050675e51f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, qt4, libjack2, lv2 }:
+{ stdenv, fetchurl, qt5, libjack2, alsaLib, liblo, lv2 }:
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.7.1";
+  version = "0.7.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh";
+    sha256 = "03vnmmiyq92p2gh4zax1vg2lx6y57bsxch936pzbiwx649x53wi9";
   };
 
-  buildInputs = [ qt4 libjack2 lv2 ];
+  buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
 
   meta = with stdenv.lib; {
     description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 2c3d4b91f25..64ffeced13d 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, fetchgit
+{ stdenv, fetchurl, pkgconfig
 , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
 , mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20160619";
+  version = "20160825";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9";
+    sha256 = "13ln5ccmrrc07ykfp040389av60dlgqz1kh6vfjkga6sq7z51msr";
   };
 
-  buildInputs = [
-    mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate
-    lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver
-  ];
+  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
 
-  makeFlags = [
-    "PREFIX=$(out)"
-    "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf"
-    "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h"
-  ];
+  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
 
-  meta = with stdenv.lib; {
-    description = "Collection of LV2 plugins by Robin Gareus";
-    homepage = https://github.com/x42/x42-plugins;
-    maintainers = with maintainers; [ magnetophon ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
+  patchPhase = ''
+    patchShebangs ./stepseq.lv2/gridgen.sh
+    sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Collection of LV2 plugins by Robin Gareus";
+      homepage = https://github.com/x42/x42-plugins;
+      maintainers = with maintainers; [ magnetophon ];
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+    };
 }
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0ec39940775..0f6bd45df27 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.3.8.2";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0wl4ln6v1nkkx56kfah23chyrhga2vi93i82g0s200c4s4184xr8";
+    sha256 = "133sx42wb66g803pcrgdwph40wh94knvab3yfqkgm0001jv4v14y";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a9e2711711f..8c5b24e7ad8 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
     ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
     elpaBuild {
         pname = "ada-mode";
-        version = "5.2.0";
+        version = "5.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar";
-          sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr";
+          url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar";
+          sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -471,10 +471,10 @@
     debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
     elpaBuild {
         pname = "debbugs";
-        version = "0.11";
+        version = "0.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.11.tar";
-          sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n";
+          url = "https://elpa.gnu.org/packages/debbugs-0.12.tar";
+          sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph";
         };
         packageRequires = [ cl-lib soap-client ];
         meta = {
@@ -833,6 +833,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "highlight-escape-sequences";
+        version = "0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el";
+          sha256 = "0q54h0zdaflr2sk4mwgm2ix8cdq4rm4pz03ln430qxc1zm8pz6gy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "html5-schema";
         version = "0.1";
@@ -1337,10 +1351,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161024";
+        version = "20161031";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20161024.tar";
-          sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj";
+          url = "https://elpa.gnu.org/packages/org-20161031.tar";
+          sha256 = "0b4dzdimdkp7116cyyq80n4h71qc477akiblbabnpb8sg87qqg7r";
         };
         packageRequires = [];
         meta = {
@@ -1388,6 +1402,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "parsec";
+        version = "0.1.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
+          sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/parsec.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "pinentry";
         version = "0.1";
@@ -1569,10 +1597,10 @@
       }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
-        version = "2.16";
+        version = "2.19";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/seq-2.16.tar";
-          sha256 = "1fc1cjbb3lrxgkhzvg4bkpxr408hhg8kqa07n0jfalrdzaa3bika";
+          url = "https://elpa.gnu.org/packages/seq-2.19.tar";
+          sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha";
         };
         packageRequires = [];
         meta = {
@@ -1981,10 +2009,10 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "wisi";
-        version = "1.1.3";
+        version = "1.1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar";
-          sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak";
+          url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar";
+          sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2048,10 +2076,10 @@
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "yasnippet";
-        version = "0.10.0";
+        version = "0.11.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.10.0.tar";
-          sha256 = "0vh70i73rknaxzglr4nragassgpjy2lj5mca2x6wqiqmv7mc8xdv";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
+          sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
         };
         packageRequires = [ cl-lib ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 4f41eb9675d..b074e657309 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -20,22 +20,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "_0xc";
-        version = "20161018.1031";
+        version = "20161027.2140";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "0xc";
-          rev = "14891d76f031ce64969004644329d7f56821aabe";
-          sha256 = "189khq7q90bdphkfx5hdj3bci7lkhcvr6yng4bbr6nj8l4qj2c5s";
+          rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401";
+          sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
           sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w";
           name = "_0xc";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs s ];
         meta = {
           homepage = "https://melpa.org/#/0xc";
           license = lib.licenses.free;
@@ -1257,12 +1257,12 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20161021.2133";
+        version = "20161027.1758";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "53dde62ab6889b0beeb3012c2bdeefd85c126140";
-          sha256 = "0m43x263d9ksmxc34hqxngxhhwi7n2blb6n11vbckx2v91si2fjs";
+          rev = "2427786228f13f5893a8513d4837d14d1a1b375f";
+          sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1381,12 +1381,12 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20161003.811";
+        version = "20161024.1051";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "563638c5b4102805e5b3282abfb2278921c07898";
-          sha256 = "10c3cgjz9q5di3cpnvx970l36akf1i0w7sxas0ppk7gpy22cg2wl";
+          rev = "11e69a143ed66e50f0c95fda93ba0a5fa8bdf583";
+          sha256 = "1n9qf9xmqbm0mjgcbzxgnmy1020rbh1cd7jmjbbfd8xhlh0kw14z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1663,12 +1663,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20161009.1046";
+        version = "20161028.29";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "3f473150009f86dac68edb02e2f22850788289a5";
-          sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
+          rev = "ae336344e61c1d38480ec230d85efbe2cb17980f";
+          sha256 = "1776s0gf9283amskmaqnpcpflqgvzk87n5qcishiczxijdymry7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2572,12 +2572,12 @@
     artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "artbollocks-mode";
-        version = "20160603.1720";
+        version = "20161030.2059";
         src = fetchFromGitHub {
           owner = "sachac";
           repo = "artbollocks-mode";
-          rev = "f4d36cf9b506cd27e0615ba8dfed59c35885cd18";
-          sha256 = "063j7q2i3701fmh44m77d572ppq0fd60hznh8jcwqa1ljbzynzkn";
+          rev = "d77a01985a9161ce1676fb18d7228a0df566942b";
+          sha256 = "1y69zq4r9ir1a2hy03lillxhw3skfj8ckkjv45i5xpasz4hjw50j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
@@ -2776,6 +2776,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "atomic-chrome";
+        version = "20161030.629";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "atomic-chrome";
+          rev = "f9a7d4c5d6bdcb0d689d41b6b9c604997b7971ab";
+          sha256 = "1v6d9l7db85ql01grx7nyz4516q41rqwyzb85xk2zx6zhx3d99ns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
+          sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9";
+          name = "atomic-chrome";
+        };
+        packageRequires = [ emacs let-alist websocket ];
+        meta = {
+          homepage = "https://melpa.org/#/atomic-chrome";
+          license = lib.licenses.free;
+        };
+      }) {};
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
@@ -2986,12 +3007,12 @@
     auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "auto-complete";
-        version = "20160827.649";
+        version = "20161029.643";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "auto-complete";
-          rev = "b0090a942f93824bcbe9a938217c665ea658eacd";
-          sha256 = "1c6gmk9j5rhjqdsgns3v0f91vy3x6zs715p68m3sh7vn7cwsdw63";
+          rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae";
+          sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete";
@@ -3693,12 +3714,12 @@
     avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avk-emacs-themes";
-        version = "20160909.1323";
+        version = "20161029.504";
         src = fetchFromGitHub {
           owner = "avkoval";
           repo = "avk-emacs-themes";
-          rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260";
-          sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz";
+          rev = "d8c91d67c78d90d04f2cda01ded019c6931250d6";
+          sha256 = "1lyxx55yd1fd52r588j9g0vrx6nl5nl8msc5si8qfh7naprr4hh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
@@ -4490,8 +4511,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "c5bfdc3bb77a8c019aa4433cf12d3c45690c27bd";
-          sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
+          rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197";
+          sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4781,8 +4802,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6";
-          sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk";
+          rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f";
+          sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -4802,8 +4823,8 @@
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "078c522f6e763dd24a30e15af9121376affe207f";
-          sha256 = "16yk8xl6ds6zp0ndfzr613k8wkzl7hnsqnmnn1bi1da5laxbwrdb";
+          rev = "6e1ba6edbd5a29991698806e775288fb3de2b186";
+          sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
@@ -5072,8 +5093,8 @@
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42";
-          sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw";
+          rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45";
+          sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5110,12 +5131,12 @@
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
-        version = "20160725.1801";
+        version = "20161024.1828";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "bog";
-          rev = "fc71c376546ed01060200de91d007f2a179bc601";
-          sha256 = "13z0zpy9ggam0v16kzqn5gncvmil3magrvrvhm304gvsqqglyiqi";
+          rev = "a6b566a4eca0dcc89a7d2af42e057b4e2561189d";
+          sha256 = "1y3i9wcvxj1s7hyxb3ni0p7hmdlln1h3a1h2ddgkjw5yv2vq768q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -5193,7 +5214,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20160921.1035";
+        version = "20161027.926";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
@@ -5209,15 +5230,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bool-flip";
+        version = "20161030.1654";
+        src = fetchFromGitHub {
+          owner = "michaeljb";
+          repo = "bool-flip";
+          rev = "04354f6412bd096cce59138e2113eb1db3dcba63";
+          sha256 = "1pdylz85sarhaakh8hdvn5mjhh4j3y6yy5sn4cjvqz9xan4g3yyl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
+          sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c";
+          name = "bool-flip";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bool-flip";
+          license = lib.licenses.free;
+        };
+      }) {};
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20161013.2331";
+        version = "20161031.1257";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "bd3f79f3f1c1aaef942ee5d2ef053534bd3adbff";
-          sha256 = "0jrrfrs277spd1h3gha9fp3jbyafj4cxzg7gdzxj9px04iyyn4zs";
+          rev = "6012b4b98c1934e567f74b48b27fd67f46ad2208";
+          sha256 = "0xyqjfmi0jnhbb8jwr6q0ynkr20vbi1npxc94kf7ddn2cgxvp0j1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6378,12 +6420,12 @@
     cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
     melpaBuild {
         pname = "cask";
-        version = "20161003.1152";
+        version = "20161024.1205";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "8712ea35172e8c63320f963a982c1b50fc7578d1";
-          sha256 = "0709zak2y1ifwl9p6qqnzz9vpblan4n7zyrlx81jrkxd3x697dkq";
+          rev = "58f641960bcb152b33fcd27d41111291702e2da6";
+          sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6564,22 +6606,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdnjs = callPackage ({ cl-lib ? null, dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "cdnjs";
-        version = "20140217.1312";
+        version = "20161031.822";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "cdnjs.el";
-          rev = "eac2b4d150907aeb2d568327d04775578c82887f";
-          sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
+          rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908";
+          sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
-        packageRequires = [ cl-lib dash deferred f pkg-info ];
+        packageRequires = [ dash deferred f pkg-info ];
         meta = {
           homepage = "https://melpa.org/#/cdnjs";
           license = lib.licenses.free;
@@ -6716,8 +6758,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "67075d95e0eef274d7d423dac80665d5b938277b";
-          sha256 = "1jrr49ckph5h2z3q1xpmbj10v7h95vaw5pidxh46l344gzbczniz";
+          rev = "3726a19cb9b33abf3ae7b760902637ed40051836";
+          sha256 = "05mfldh44j07wslbz3hq874amfld42vwkg70f0966rmlh1nz3rwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6756,7 +6798,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11826";
+          rev = "11866";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -7107,12 +7149,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160923.2342";
+        version = "20161031.414";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "3d0ccf663fd6b3753a886239dd64fbef44bc02fd";
-          sha256 = "0ggz80wlq86scdvfpg4fg9hvwgis9qwsfs52dyk2gpwfpqyn7pmc";
+          rev = "4e5267fab7765661075c0e79122ec358cfb7feb5";
+          sha256 = "0lhs6skd6jvgs9hk1f564mc94cd2fxn56dhnpdwqijrg9a4c06m5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7167,6 +7209,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-pyim-wbdict";
+        version = "20161029.2308";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "chinese-pyim-wbdict";
+          rev = "7a755a1808526bd777b1fd5049b3891fd9a5ec0c";
+          sha256 = "04c87l9y53xq21najw37wywilaxpk1kki8y2pisjyd36rvr7ad1y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
+          sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c";
+          name = "chinese-pyim-wbdict";
+        };
+        packageRequires = [ chinese-pyim ];
+        meta = {
+          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
+          license = lib.licenses.free;
+        };
+      }) {};
     chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-remote-input";
@@ -7233,12 +7296,12 @@
     chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-yasdcv";
-        version = "20150702.616";
+        version = "20161030.1504";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-yasdcv";
-          rev = "619e4d701ed995ad2c95f35072c638cfb3933afb";
-          sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
+          rev = "664494d4c4562a4d83a0e73386f854829d7a52c0";
+          sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
@@ -7590,8 +7653,8 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "284990";
-          sha256 = "15d5ils5nlqydqmvjjm5znnbj9r489n9018qym8zl58m2dw0i753";
+          rev = "285627";
+          sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7754,12 +7817,12 @@
     clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "clippy";
-        version = "20140417.414";
+        version = "20161028.1254";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "clippy.el";
-          rev = "23ba8772056a103267611b3757722730740d9f00";
-          sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
+          rev = "ad4b5dba4cede6d4b21533186303d3d3e9a2510f";
+          sha256 = "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3743596c4b6387351684b1bf00f17275b8e59e8/recipes/clippy";
@@ -8081,12 +8144,12 @@
     closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "closql";
-        version = "20160902.1242";
+        version = "20161025.947";
         src = fetchFromGitLab {
           owner = "tarsius";
           repo = "closql";
-          rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66";
-          sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk";
+          rev = "c230818f23f0663c5775c4ec05136b8ff5862367";
+          sha256 = "0qnxfzancvpn36fq4q0v7fj0p5ra1qm1rkh5yw4ldiz6bj7h6r67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql";
@@ -8232,8 +8295,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "f660832999e086f02a9f3552c028aed900cd7249";
-          sha256 = "02v72yi1b3crq549959wi0a4rxjwknzkx6wqalraz7r2p5vfwdwy";
+          rev = "098a18c476b5e60b3bacc0e47f23359fc4a3ea2c";
+          sha256 = "0aqza32r1rwhhrzckprcs7gch55l952007h2n7pf2jx0napk9rid";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8663,12 +8726,12 @@
     color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-modern";
-        version = "20160411.1846";
+        version = "20161029.720";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "replace-colorthemes";
-          rev = "7107540d22e8ff045e0707de84c8b179fd829302";
-          sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
+          rev = "c76b6e8e702457fc2e8907b367efdafd3b7123d9";
+          sha256 = "0ffvjilk59mbq8mn069hr9q0a0w3yqy6v3r3q94ca22bsv0gwcmm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern";
@@ -8765,27 +8828,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "colorsarenice-theme";
-        version = "20150421.1336";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "colorsarenice-theme";
-          rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6";
-          sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme";
-          sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
-          name = "colorsarenice-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/colorsarenice-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "column-enforce-mode";
@@ -9067,12 +9109,12 @@
     company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-auctex";
-        version = "20151102.643";
+        version = "20161025.24";
         src = fetchFromGitHub {
           owner = "alexeyr";
           repo = "company-auctex";
-          rev = "780ba68b4154ecac4f20dbd4b1ba561ba40f248b";
-          sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
+          rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3";
+          sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
@@ -9857,12 +9899,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160918.1527";
+        version = "20161026.2337";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
-          sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
+          rev = "140079b822452b141ce022bbf082deae17edd6d3";
+          sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -9899,12 +9941,12 @@
     composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "composer";
-        version = "20160903.1100";
+        version = "20161029.1317";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "5437ce0417e79ab4aad54f25bc756041eda4dece";
-          sha256 = "02x1hs3mv7llidkig15m88nb3zp20smy6b80p7c71vbzapp1mz52";
+          rev = "47d840e03412da5db13ae2b962576f0166517581";
+          sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -9924,8 +9966,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08";
-          sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn";
+          rev = "9b46dedcb89923de417f7557743c4c22421f5787";
+          sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10192,12 +10234,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161020.2248";
+        version = "20161030.48";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
-          sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
+          rev = "df9ad89bec43777513b3f0efe031cd81dcf47820";
+          sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10441,6 +10483,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "creamsody-theme";
+        version = "20161024.2339";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-theme-creamsody";
+          rev = "bc8ef72dd2b974354bdb108d73fd5468304d1b51";
+          sha256 = "0p7f47n10ckd8iqa9r2gps5yf235v88ssla177fn370j0lnhhayi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
+          sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
+          name = "creamsody-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/creamsody-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "creds";
@@ -10712,27 +10775,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    cssfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "cssfmt";
-        version = "20150818.2128";
-        src = fetchFromGitHub {
-          owner = "KeenS";
-          repo = "cssfmt.el";
-          rev = "802c82a1aa8d433ec473e253ae1fa4ecad3fb4b0";
-          sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d95ca68c481061f5dc2614ae660a98d53837c46/recipes/cssfmt";
-          sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
-          name = "cssfmt";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/cssfmt";
-          license = lib.licenses.free;
-        };
-      }) {};
     cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cssh";
@@ -11167,8 +11209,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "d8c5467133aa16c3eccb19427c41a62a51115837";
-          sha256 = "1afanvmf4w1ic2gr8nzrh47f5gbp83bbhrzgfpwfk4ci3487y47l";
+          rev = "ccfebe9171fe65484d459aa3f0f3c1c97397c103";
+          sha256 = "1ji1hra4iahy12067qzda0kbw5ry9khp6z0gbfrihzjq5rmn4h3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11268,12 +11310,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20161024.227";
+        version = "20161026.201";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "203e731f0415789fd1e15f795f245ab19ebd8cc7";
-          sha256 = "1j88rqh2rqhmas72wz8y2j6izgq23q53x33wz33bfjprrs14dyv2";
+          rev = "a667ef6967008ae6176838efd26b3631ba63a3df";
+          sha256 = "1qrvss2qw88xqv040bp143h7aab78j1kp9x5j4s6pz0ihj593ywn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11457,12 +11499,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20160212.1121";
+        version = "20161026.1510";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "05fbd30fb4dd1ce931fb15a3e88b13eeec5526ef";
-          sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid";
+          rev = "1f65c88dbc55dfc6c7d5322e693d6d30962b27ea";
+          sha256 = "1ki5a104r302cxbmqj8h9ddbrp46la7yz3bxj1kxv8sl9afgbqcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
@@ -11881,8 +11923,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08";
-          sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn";
+          rev = "9b46dedcb89923de417f7557743c4c22421f5787";
+          sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
@@ -12001,12 +12043,12 @@
     demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demo-it";
-        version = "20161021.1305";
+        version = "20161029.1731";
         src = fetchFromGitHub {
           owner = "howardabrams";
           repo = "demo-it";
-          rev = "43b1ee8180d0e0eeb91998eb81dbae11eac23bff";
-          sha256 = "1amgjanl0dmsfv3w2kvggiq5yhwb3qvp7lfhgl29xg8gjdgy60z1";
+          rev = "bc5d373bf22bb2458d5a5f9a9cf1917ab34b32f8";
+          sha256 = "1kj8pr42cijk6xzj94hrkbplbark4dqrb0hcy7929ps80zbjqkn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it";
@@ -12297,8 +12339,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "dim.el";
-          rev = "110624657fec0c8a7b3589108230e6a635302ae0";
-          sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i";
+          rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445";
+          sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
@@ -12624,12 +12666,12 @@
     dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
-        version = "20161023.19";
+        version = "20161030.1510";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-icon";
-          rev = "ffcd62cb997efadbbc1da62e1cffe957a21a22c8";
-          sha256 = "0say1v2xlqhdvkbfcm7yfmqad2lq9c7m6ldplsxcw921yfadf4qx";
+          rev = "6869d1aee10317f2d4fc49d343d642d422b7117b";
+          sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
@@ -12768,12 +12810,12 @@
     dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-quick-sort";
-        version = "20160524.338";
+        version = "20161025.1322";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-quick-sort";
-          rev = "f819be0bc67d8e8593fbbf71f1117b3e4fa33c27";
-          sha256 = "12xcck2hypw13r522naghmfjpykld11ahyz9rqfz6qh8dnv2j234";
+          rev = "192a2535025d4644729b65f38474eaf54c999f18";
+          sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort";
@@ -13678,12 +13720,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20161018.2349";
+        version = "20161031.249";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "6fcc5082b4cb4b40e75c36d2569511139ee9de72";
-          sha256 = "16hw7qbbln3rcd6n052wqwyyw5mpd4h4fsg4c2pz8vwixk5jhnmj";
+          rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
+          sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -13946,12 +13988,12 @@
     dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dot-mode";
-        version = "20161005.1443";
+        version = "20161025.1037";
         src = fetchFromGitHub {
           owner = "wyrickre";
           repo = "dot-mode";
-          rev = "783ccf5b1de591e9926c0b7133ad64a26db62315";
-          sha256 = "1zsbr6cyyynczik7wdd7p6ii5nw7zn44ir7lvm2kkslwjswx34qc";
+          rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc";
+          sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode";
@@ -14260,7 +14302,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1766432";
+          rev = "1767359";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14780,12 +14822,12 @@
     easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-kill-extras";
-        version = "20160418.1919";
+        version = "20161028.504";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "easy-kill-extras.el";
-          rev = "65fc4fdfb79c6dd679b4a1a57fa657b4b39919cc";
-          sha256 = "0mmhqid0x56m0p3b18a757147fy8km3p4kmi0y94kjq04a4ysg3k";
+          rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
+          sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
@@ -14885,12 +14927,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20161016.1143";
+        version = "20161029.1119";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "007c001d8a200ed27c0bf6f32e09f6ed38a1fb37";
-          sha256 = "1374r0j8i5zmxdnd23h7svpbcwghb2wskn0fgpvnk06859xjhpgl";
+          rev = "cbe1e6dad9fe5a1fbe48e2f74d734c82d920be88";
+          sha256 = "0w58jfj4mnhniq6n78y1yffs0md2xnrs8d1iqn34vagnp9zlr589";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15483,8 +15525,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "1d18f9f62fe85cf18b5ab522069d83d4733e85c2";
-          sha256 = "0znr8i6p5ik8dh3abwycgfdm0byz0ywnj4fwh98smwb1ad3jdv37";
+          rev = "1d5b34e4813000b61255f56af15d005a5947ef92";
+          sha256 = "19jdix3r1pl2p6v9jrhgpf3h0fdl74js8xrj83c4lffhi3ry5w3x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15500,12 +15542,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20161017.2111";
+        version = "20161024.2138";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "758820bfd9a6bb3c95d559074e508a19308868d8";
-          sha256 = "1npy4471xy9f2ww1851nqfpskxw0g3i7ls1ca1zzmjc7iqsm5irf";
+          rev = "4b97a2e213a960cf6902ad00879262c1b274e122";
+          sha256 = "04y0c385w7m60wsknaxc00wb07hkdnlvncr7qgsh5hwh61ggfh6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15561,12 +15603,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20161021.1010";
+        version = "20161030.1637";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "701ddbe39cd11d751601fd7830dd8f26e2dfebeb";
-          sha256 = "0g627j293hykhzxzb9q3ab2xy4ycdkfh905wyyc4fvxci0672zkv";
+          rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449";
+          sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -15670,8 +15712,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "0eafb42926eb4698cef52878c34ae6d1a6246b23";
-          sha256 = "0fry19m2012gpsllilp02pyzcq29y4r28rq5pik4rv2znn9zvp9j";
+          rev = "2e03d2d12af7b38c92a89ab6f61dd69f163fbd90";
+          sha256 = "1csxihkh874p8jm0ndhwl1pnk3k5jdazxba439rzd8ni0rppsi4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16080,12 +16122,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20161021.1247";
+        version = "20161030.1731";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d54bc55af47591e87e3af9d72b91108c55629719";
-          sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk";
+          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
+          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16150,12 +16192,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "20160904.1131";
+        version = "20161030.1731";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d54bc55af47591e87e3af9d72b91108c55629719";
-          sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk";
+          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
+          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16171,12 +16213,12 @@
     elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
     melpaBuild {
         pname = "elhome";
-        version = "20131202.1108";
+        version = "20161025.1342";
         src = fetchFromGitHub {
           owner = "demyanrogozhin";
           repo = "elhome";
-          rev = "af112592fbc41a625d1d17828db78357df23c127";
-          sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
+          rev = "e789e806469af3e9705f72298683c21f6c3a516d";
+          sha256 = "1q9glli1czbfp62aalblaak55j8rj2nl8bm8nifnnb8jrzj1qrn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/527cc08a3424f87fe2e99119b931530840ad07ba/recipes/elhome";
@@ -16255,12 +16297,12 @@
     elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "elisp-refs";
-        version = "20161001.1123";
+        version = "20161027.2208";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "f4c04cbf533bbea93ac2fb6b6a41ba50c4dd2456";
-          sha256 = "07x2hkhjm7nazi10h5sfkvcnpzyg86q383qyqclp78f5n6l4axif";
+          rev = "f710313f4be05ff475c16ffda77f01026512ad34";
+          sha256 = "0vdlcc4mfpda5pxwwfdqwnq3jhgv9mgj6739gnb00i192jg4605g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -16360,12 +16402,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20161006.11";
+        version = "20161031.51";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
-          sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
+          rev = "a842d54348846746ef249a87ac7961a9a787947f";
+          sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16591,12 +16633,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20161008.910";
+        version = "20161028.215";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "22bfc60a8017e7cab18b442818210263ffc6d24a";
-          sha256 = "1q7wbjz3y3xd31fprf9dpv6ifjijw31kwsgayg7dl0bxkhqigrfn";
+          rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
+          sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@@ -16849,12 +16891,12 @@
     emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsc";
-        version = "20150807.257";
+        version = "20161028.1006";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "emacsc";
-          rev = "02325c640232ee184314eb58d0051f365f7f085c";
-          sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
+          rev = "421e0c567358769e32f670ae8e949d99abae0c28";
+          sha256 = "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc";
@@ -17636,12 +17678,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20161023.113";
+        version = "20161031.246";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "525692bc3ca2b4edb1122fd9f0101eee768caf93";
-          sha256 = "1813f8yzyfpgc9b36fsznqkbjm9wnb2zs5kmwdl3wwg674lwm2dh";
+          rev = "8f3f3f1e46aaeaabd87748c8f89c2bd4bc420dd0";
+          sha256 = "0z62lmajsf2f8027lncv8bz1hwpfl2x84l10gx0qs6pdj59x1c5a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -17749,12 +17791,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20160902.1246";
+        version = "20161028.1231";
         src = fetchFromGitLab {
           owner = "tarsius";
           repo = "epkg";
-          rev = "b0606f9800c971085d5fef17dfe242aece378fb3";
-          sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3";
+          rev = "979cb9cd6143a3672b4b175073ec3a8cd22d3863";
+          sha256 = "00xqqnvp13ipbw1ilx42pb670z2h8rlvdpwa9cirkmvv8c54wkji";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg";
@@ -17791,12 +17833,12 @@
     epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epm";
-        version = "20160628.4";
+        version = "20161027.34";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
-          rev = "82e342af7be59aa94bb0fb0e2a29a98c65cf2ef7";
-          sha256 = "06fyndwgkmylhan81rpnv8h729p70iqrmxgbmsdm5fjrdgzzs3a6";
+          rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a";
+          sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm";
@@ -17893,22 +17935,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "20160323.1839";
+        version = "20161029.2101";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "e0c9951aae52b54d766c666214b25a64ede116a4";
-          sha256 = "0yiv16k0b2399asghc7qv9c9pj6ih0rwc863dskr2isnpl39amra";
+          rev = "2d7e5bec956f17203b916772a980c8115d6c70d1";
+          sha256 = "0k77l8mj28c0z5d9wq07sblb4w1z0asy0vdxpl74n6r68sr66y57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/erc-crypt";
           license = lib.licenses.free;
@@ -18231,12 +18273,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20161012.2127";
+        version = "20161025.1222";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
-          sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
+          rev = "f12edbb42f512ebeabcfb0a56e89924c21ddc529";
+          sha256 = "12zmq9bsfjiigp3fdnqa349dmc8n5mb2j1szlpmzj2f4i6vm9rk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -18273,12 +18315,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20161019.117";
+        version = "20161024.359";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "055b1b09537b8900489d28ba37078edd7be57d04";
-          sha256 = "05kj124sdrc29b1agcf1cps27kn023z6ii6smf6cds091nmqf897";
+          rev = "056789659edec99e5500c4508f00460b98d6c73f";
+          sha256 = "10p04f4r9qyqlwxlvjcfhblgjh565108bvxxqjqcv34651qdvikx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -18374,12 +18416,12 @@
     ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "ert-runner";
-        version = "20160815.1309";
+        version = "20161027.159";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ert-runner.el";
-          rev = "b4ebafe62d0593adec38a3845af6b5499df4ab39";
-          sha256 = "0babcbyarqxfqka5dl91zz58wyz1j7xfc8wy0r9818lwj15nr422";
+          rev = "10628b8b90294077174f78e7b75e548f2a4b6f78";
+          sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
@@ -18651,8 +18693,8 @@
         src = fetchFromGitHub {
           owner = "peterwvj";
           repo = "eshell-up";
-          rev = "380d7f66b2f7118be786289e9c8d87b5106803da";
-          sha256 = "1ll0k99jblswp04hw2n9i7g91hypgpgxdh1cjfzd84pdwlc4avc5";
+          rev = "1e6313bb62c573c0f07d3fc6dc910b7a48bc1b18";
+          sha256 = "0ffs6iw0v2y2gggpr7hpzcclcdvfim98d3ln38bf1bnajfjg0fz7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
@@ -18962,12 +19004,12 @@
     etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }:
     melpaBuild {
         pname = "etable";
-        version = "20150327.1016";
+        version = "20161028.1309";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "ETable";
-          rev = "8c9a32a92e7f808874c150c851f1605b2dd83d6e";
-          sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
+          rev = "d502141f0c69bf95256ba5cb9cd15350c7e942d2";
+          sha256 = "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/etable";
@@ -19400,8 +19442,8 @@
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "evil-embrace.el";
-          rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3";
-          sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn";
+          rev = "9c40afed6603bf6367b58fa1ccf8aa6feb66eff3";
+          sha256 = "05hshgfkp8lkmz5bky95ky53jdb869w3x3sv30lq7qc6b7qxrjfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace";
@@ -19711,12 +19753,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20160923.1622";
+        version = "20161025.1223";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "540846d2769b7466f4d98accafdc4e0d1dc76ece";
-          sha256 = "0j970h7xapg3y29rsyhirmda81d59ck5acjz0yrmjxjy0f61kq3w";
+          rev = "bb6733d5ac08dad8754507c642f6a03f05f339eb";
+          sha256 = "1xbkai747ql2kh6g80i35hgfbaqv9is98qxcw6g8zzvl8rrwkh4a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -19795,12 +19837,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20160524.400";
+        version = "20161031.409";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "8e126cda3d47f87f96d81b5abf76188d3b6316fe";
-          sha256 = "05lv08gj0659j16jf8x1pif3b885vnj0qg3md7n827la9k94sfml";
+          rev = "54c618aada776bfda0742819ff9e91845a91e095";
+          sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -20047,12 +20089,12 @@
     evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20160911.1224";
+        version = "20161029.606";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "3812140e11a1b30878701cc028a4305ec3280a35";
-          sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj";
+          rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2";
+          sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround";
@@ -20530,12 +20572,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "20160625.201";
+        version = "20161027.1213";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "90b6b364bb372354deb32463a9a259ac9a16da7f";
-          sha256 = "1fl26ix15bd8qgf8q9p68n92y6zmgkydrswhrwzxp8znnirkps3i";
+          rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc";
+          sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -20771,12 +20813,12 @@
     faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "faff-theme";
-        version = "20160928.741";
+        version = "20161026.1047";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "cdac27efa1ed24c536b26df70476405e78c1de5e";
-          sha256 = "1hwypmqn3q14kw9ayd89nfnk92m5k4anzi4d2sxi54sjxdl02lwn";
+          rev = "61d98d43c9173662078c0c337ce78918eb6a3610";
+          sha256 = "15shbzjpl89ybyyn7d53psn9i8csxi2h9jwz7mx98lg9pjy58ifa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -20838,8 +20880,8 @@
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "fancy-battery.el";
-          rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68";
-          sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
+          rev = "9b88ae77a01aa3edc529840338bcb2db7f445822";
+          sha256 = "1k6prddw277iszh9hq145yqidwiiy9iqz656rpmqwn5hmr1vakhk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery";
@@ -21264,12 +21306,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20160909.1355";
+        version = "20161026.145";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d";
-          sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p";
+          rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc";
+          sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -21807,12 +21849,12 @@
     flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flim";
-        version = "20160831.633";
+        version = "20161029.1930";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "flim";
-          rev = "b0d16a821c720ec9b32cf41a545656d3c00478ab";
-          sha256 = "06zgl3j12ljz0w8p4p9n64jws3wjjiaydaih6bhzasbn94qmh2qv";
+          rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0";
+          sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
@@ -21951,12 +21993,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20161023.738";
+        version = "20161030.316";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "b6e3e2db7bd8347a93637f78cc8fe20c4a4b6008";
-          sha256 = "03h3g2yb4lfhg2z6n3isgy7kf6g5q3ph6k0f07kq0vg3rg4486ra";
+          rev = "f8c20f4f986ba79f1e6960d3bc59498e6fb5eff3";
+          sha256 = "09ydncdd8jkh22mfdq3ykzrxrscf05ks5dp1x6frv5ybf4dz33ql";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22161,12 +22203,12 @@
     flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-css-colorguard";
-        version = "20161002.242";
+        version = "20161031.422";
         src = fetchFromGitHub {
           owner = "Simplify";
           repo = "flycheck-css-colorguard";
-          rev = "d42f5e17d9991604da2200afd4af2e1cc48533f0";
-          sha256 = "09p3dclx9pq0b4i005gjyg5qqlcls65f3qkkym1sny2jmd9nrg61";
+          rev = "ae94fa0396acd99f9ec36d9572459df793f37fe8";
+          sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard";
@@ -22812,12 +22854,12 @@
     flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-rebar3";
-        version = "20161022.433";
+        version = "20161030.615";
         src = fetchFromGitHub {
           owner = "joedevivo";
           repo = "flycheck-rebar3";
-          rev = "534df87b0c2197fa15057f1e1a19763411c59220";
-          sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
+          rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
+          sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
@@ -22942,8 +22984,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
-          sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
+          rev = "140079b822452b141ce022bbf082deae17edd6d3";
+          sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -23610,12 +23652,12 @@
     flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct";
-        version = "20161014.216";
+        version = "20161031.1134";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
-          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
+          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -23631,12 +23673,12 @@
     flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct-helm";
-        version = "20160730.201";
+        version = "20161031.1134";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
-          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
+          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -23652,12 +23694,12 @@
     flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct-ivy";
-        version = "20160730.201";
+        version = "20161031.1134";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
-          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
+          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -23673,12 +23715,12 @@
     flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flyspell-correct-popup";
-        version = "20160730.201";
+        version = "20161031.1134";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa";
-          sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16";
+          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
+          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -24278,8 +24320,8 @@
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "frame-restore.el";
-          rev = "6346cf157d5e1b487a16839d998258b7e693cbc8";
-          sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
+          rev = "3fc6a84d1629f3c219bf3fd4309b2253fdcc99b5";
+          sha256 = "11k3jmabf2i5ivb5gk19k2ij3svfzwlwxvrxaby1k0isp537fabr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore";
@@ -24439,12 +24481,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20160719.315";
+        version = "20161031.959";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "3ab9f2ec3d0b70545f3834d26dbdadf760648f6d";
-          sha256 = "06znv94bbx97j50226b5x2q7vnjb6j57ljmaygj0cvy8linr5j8n";
+          rev = "d5b9fde6dec186972f6ea457582504ca813b8778";
+          sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -24492,8 +24534,8 @@
         version = "20161007.2213";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "417e296d46a80eeadcdbfcc06b017ccb3f86fbb9";
-          sha256 = "00ghsi7yr540km7c2b4202pq17qak8g8gziqlx6l5nw64hjjkg6n";
+          rev = "e9cd20604c557ced77c19393da43a4a0821c2e37";
+          sha256 = "1np02migjmwj3l1jajjafw35vqhshkwizdx30kl474c5f5iibk1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25114,8 +25156,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "757e17f34ae7c9c167cb98a5b404c7854e7d57ee";
-          sha256 = "0y61l3c4rnhydr84v18r42bg26wxs3rm4nfcj822z3s5hrsd34cd";
+          rev = "a0ff7155e6a567db5a40a4f22c479b27cba25248";
+          sha256 = "1sbx7sx4j9cvi5h004z2hhyaxp2qi1mlxwsfs8rmn5vw7djl40j1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25359,24 +25401,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    git-blamed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "git-blame";
-        version = "20110509.926";
+        pname = "git-blamed";
+        version = "20161028.1226";
         src = fetchFromGitHub {
           owner = "tsgates";
           repo = "git-emacs";
-          rev = "cfd3afe42b7d314c0cd1fc280dc35c69fc133869";
-          sha256 = "125lh4gkxa0i66kvr0a6mrnc33knpqafjm3vg3278wy69pqrrznb";
+          rev = "cef196abf398e2dd11f775d1e6cd8690567408aa";
+          sha256 = "1n6x69z1s3hk6m6w8gpmqyrb2cxfzhi9w7q94d46c3z6r75v18vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/git-blame";
-          sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
-          name = "git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/87bc01218964a01cfd471ee068ed75976793a568/recipes/git-blamed";
+          sha256 = "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p";
+          name = "git-blamed";
         };
         packageRequires = [];
         meta = {
-          homepage = "https://melpa.org/#/git-blame";
+          homepage = "https://melpa.org/#/git-blamed";
           license = lib.licenses.free;
         };
       }) {};
@@ -25408,8 +25450,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
-          sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
+          rev = "63e2c3af0d39530802dccc5d23df293753947a6c";
+          sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25467,12 +25509,12 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160903.852";
+        version = "20161030.1851";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "338172b896bcc758a7e635cb5f79e19addf167e6";
-          sha256 = "19a535y7k5s0kw12qrvxd74mb5ikszh0alsjivqpc8ydzvpqb9r7";
+          rev = "0e33154a7d78bd7739fe081537dea49e309fbdd2";
+          sha256 = "0q6cx0v2b96abxspx6czahvsccz3rsaqvphrhfv6gn6p1b95a8fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
@@ -26745,12 +26787,12 @@
     godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "godoctor";
-        version = "20161014.2042";
+        version = "20161029.2346";
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "godoctor.el";
-          rev = "d0755622a2600aece8c3319de0a1b8bc6d798ec3";
-          sha256 = "1b7r3c5n3yp92gsphiyadp4ab9185vzfbbqqzgxq8rcxi3f4yjv2";
+          rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a";
+          sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
@@ -27145,8 +27187,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
-          sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
+          rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185";
+          sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27798,12 +27840,12 @@
     gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gulp-task-runner";
-        version = "20160911.430";
+        version = "20161030.646";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "gulp-task-runner";
-          rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2";
-          sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq";
+          rev = "72ac9e8b2e69d7348e10003f4b434b7b96856781";
+          sha256 = "0iamindbxhqiq8w6rkjway35nv2df347bsfakszzk68ggl2i73xh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
@@ -27858,6 +27900,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gxref";
+        version = "20161031.451";
+        src = fetchFromGitHub {
+          owner = "dedi";
+          repo = "gxref";
+          rev = "ddcd81ddcddd1715c8363848bf9d49553a91f148";
+          sha256 = "1irg6jrk6wq6gzfbx79993qc82p9ilrs9gnz96hghrk2m8maizaj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
+          sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby";
+          name = "gxref";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gxref";
+          license = lib.licenses.free;
+        };
+      }) {};
     habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "habitica";
@@ -28218,12 +28281,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20161020.2211";
+        version = "20161027.139";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "7c763a3dd75b303da06917441c294516520dc3d1";
-          sha256 = "03g79q9w08nbypjjs3zrlp85l99picyy101z0wbzz6gpxcwdqr15";
+          rev = "cde6c60b0e511a7e22290542c4e8e5bb9b253cd0";
+          sha256 = "0xpp1n8x9359139cndqpmggf18d6y2zlvwh96i0dqwqq3nniplxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28486,12 +28549,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20161024.701";
+        version = "20161029.1047";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced";
-          sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m";
+          rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6";
+          sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -28570,12 +28633,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20161020.952";
+        version = "20161025.809";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "5bb0effbfb526d545a0b5a243cc5ed386ce72029";
-          sha256 = "1cagdwiy2h0nhsjfbkmhnaklfy0jfy40b0cfc17xd9ywr55g19ym";
+          rev = "7a687f97e0ae7cb4cc4520aee9c97f84f2088ed9";
+          sha256 = "01bl45i841h8n0ndjyj472m7w3pv0mnzmw8fy9ggbh8rcbhr61wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -28675,12 +28738,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20161018.807";
+        version = "20161031.258";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0";
-          sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx";
+          rev = "46285116549fec9933fd035067773f5084937526";
+          sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -29032,12 +29095,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20161024.13";
+        version = "20161028.2141";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced";
-          sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m";
+          rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6";
+          sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29809,12 +29872,12 @@
     helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hoogle";
-        version = "20160913.1022";
+        version = "20161026.2234";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "helm-hoogle";
-          rev = "882b729b9f0f23d35e808e0dcd51047954486135";
-          sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d";
+          rev = "73969a9d46d2121a849a01a9f7ed3636d01f7bbc";
+          sha256 = "043bddm6lldl6wkifr1plqip7laai771z1a1l0x2h35l3g8c64h0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle";
@@ -30064,7 +30127,7 @@
         version = "20150717.39";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "154226";
+          rev = "154482";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
@@ -30564,12 +30627,12 @@
     helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-rage";
-        version = "20161020.554";
+        version = "20161030.914";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-rage";
-          rev = "ae05bfa38f83e6b6c468b26ab4b02dfd29569108";
-          sha256 = "1jjxfzvzqjg2illwn1ljv03cxjcfmkgsq3xvk7x9247xkv61xifk";
+          rev = "07c268d162d11d8b4254a78a1bdaf881cdc560ee";
+          sha256 = "1dzlawga65z0c49xzwpya09clcg013w7fm7mhqf70cniim5mcya8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -31537,12 +31600,12 @@
     highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-escape-sequences";
-        version = "20151231.412";
+        version = "20161028.1617";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "highlight-escape-sequences";
-          rev = "ffb8c5da19ffd2a71003b93fe33f78d0900fad9e";
-          sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
+          rev = "c3f28f2003638e88e5cf0b03835412af7814f3b0";
+          sha256 = "052r7bxdflgvygpvc5p63kkv11l9f7vfn16b1094af7xnniv8i3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences";
@@ -32154,12 +32217,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20161024.921";
+        version = "20161026.710";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "a26cf703567661488fe1bb8550f301d4db19da08";
-          sha256 = "0vs26h7kwjawj7mbijz13p8fp84cypn6x3pjshvvl9mbd8v0yww4";
+          rev = "589f0d36b9bb15665d84f0fc7bb401928d704449";
+          sha256 = "0bid6y0nyikwzi1nqczds2p3p7glm7hiwj0mgqfminpyaldvgfi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -32506,22 +32569,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "http";
-        version = "20160701.2025";
+        version = "20161025.1120";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "http.el";
-          rev = "5a85cb63ff8c25031c7a21f9ec7063a4ccfac547";
-          sha256 = "18b8xf01n0mjshw7a4y1y3gzmag3lv9y64jyfb0dbx99xlxvvdv8";
+          rev = "3b8cac5d30bf8142cdb9839292f39643be326f5b";
+          sha256 = "0842l2wbk1f86lxzjsicqwxlmw639w26pr3dfk9rnymwzpm267kg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
-        packageRequires = [ emacs request ];
+        packageRequires = [ edit-indirect emacs request ];
         meta = {
           homepage = "https://melpa.org/#/http";
           license = lib.licenses.free;
@@ -33529,12 +33592,12 @@
     iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iedit";
-        version = "20160927.1726";
+        version = "20161030.1920";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "39919478f9472ce7a808ca601f4c19261ecc2f99";
-          sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g";
+          rev = "abcc27a9f07a7f855b0a8314f18640fd5cd7a0b6";
+          sha256 = "152vxkwndv7ffggsnb1jhizf8p2fd5mbplwiln6ig2lzn21drdpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit";
@@ -33940,12 +34003,12 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "20160504.2210";
+        version = "20161026.1046";
         src = fetchFromGitHub {
           owner = "galooshi";
           repo = "emacs-import-js";
-          rev = "ce454d36fbbdd6cc9659eb0ef3c42560bdb6bfa5";
-          sha256 = "1pv29qxiz9yqfp67fjj4mk8bqxs5y4qwcpx4kvznpfzdcwsza53j";
+          rev = "5726c33b8d8c43974d4b367348962025c6df56b9";
+          sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
@@ -34003,12 +34066,12 @@
     indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indicators";
-        version = "20130217.1405";
+        version = "20161029.706";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "indicators.el";
-          rev = "c6d520eb3536cf3a77c635fa36fec031d3f84fe4";
-          sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
+          rev = "a9f228bab20285d599976d3acd506b38e03a0ff3";
+          sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators";
@@ -34503,12 +34566,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20161020.340";
+        version = "20161027.207";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "e858b01160bd1ed844ceae54d785032907dea4a7";
-          sha256 = "1laaqs85fhrrl860xv7s1fjiz2mm3a2xdwpd0b72h1991q19dhwf";
+          rev = "fe0b045aadef5590eb33e03c1512430e5d52d639";
+          sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -34835,10 +34898,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20161022.1545";
+        version = "20161030.1449";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "15a8gd2rsllk5avv6w0m1dkjv6aydsbbimywvj0i3mwjm6ika9lj";
+          sha256 = "0jnch3c9zhil6k4dm4qgqf896vrmbfg7dlhqivlq6iij4a9mzjpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35061,12 +35124,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161021.2214";
+        version = "20161030.27";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
-          sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
+          rev = "df9ad89bec43777513b3f0efe031cd81dcf47820";
+          sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35082,12 +35145,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20161018.807";
+        version = "20161031.258";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0";
-          sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx";
+          rev = "46285116549fec9933fd035067773f5084937526";
+          sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -35149,8 +35212,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
-          sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
+          rev = "df9ad89bec43777513b3f0efe031cd81dcf47820";
+          sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35353,12 +35416,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20161014.103";
+        version = "20161028.901";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "c9dfafc5e721db7cd11f02ca65fdf8ec3798f6e9";
-          sha256 = "08xa0839df1pz8n2zk1zsr89lzrx0a5a2cjvq9gdmmgjqppry9hs";
+          rev = "b944e8e88a209a15d3a7fc163de3345d9dd8fbf6";
+          sha256 = "023j5majib0xb2xi8nk4grflfrwya8g1sxvrdp4qa3md5pwp9nfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -35693,8 +35756,8 @@
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "12811feaa621bd06d29ebb0e0021d650e4c442d8";
-          sha256 = "12m4iw9fjjr2kr1ffwhk98j1fs76zxrqhkbn4m9mg5cb96lmgmi9";
+          rev = "788a75abd2df6bfce1073cdd2c39ccb58586360b";
+          sha256 = "0iycwrcj4r9nncikl9hrqjg6snwwl7q2nv2x4fixzkkhs8f9gyah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee";
@@ -36043,12 +36106,12 @@
     js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }:
     melpaBuild {
         pname = "js-auto-beautify";
-        version = "20161021.1922";
+        version = "20161030.2209";
         src = fetchFromGitHub {
           owner = "Qquanwei";
           repo = "auto-beautify.el";
-          rev = "71f69c8ba65faf66c4752af322b45f56c3239ebd";
-          sha256 = "1z2y4r1p3ar9h8irkyh7ifvpp1igjmdmag5wzqa828xhs1xhbq80";
+          rev = "dd2e5940a07c5bb8e793f25e644def62c3426eed";
+          sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify";
@@ -36106,12 +36169,12 @@
     js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "js-import";
-        version = "20161022.620";
+        version = "20161027.2259";
         src = fetchFromGitHub {
           owner = "jakoblind";
           repo = "js-import";
-          rev = "fdc6709469a95c848aa1619c11230827a9670206";
-          sha256 = "1cldgsyy7jrm1splqk5fhg5x033ra8827wzv9z57734z6di1yk6a";
+          rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9";
+          sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import";
@@ -36169,12 +36232,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20161016.156";
+        version = "20161025.1012";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "91e722a798fc8c30cfa4fad119acc83892d41e9c";
-          sha256 = "1pg9cdl8i10qlbsr756dsrsjvbp6fym04a97q54mfgjsv25kvrg7";
+          rev = "94b27217cd8305029fdfdd2f4ef660622de8a582";
+          sha256 = "0p8025p7n6frmdiycr5g8fg8hs2ygszpmx51c1xla2qjhn7wcf61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -36190,12 +36253,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20161019.911";
+        version = "20161025.649";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "1d15ffd95c0eecbb5ba3b5b5189ba87eb2126fdd";
-          sha256 = "1nk1ap4cy6fqyy1c6prqnv0spcqy72vkjw2npnzffvg9afqcrlyh";
+          rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38";
+          sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -36299,8 +36362,8 @@
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "json-reformat";
-          rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4";
-          sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y";
+          rev = "8eb6668ed447988aea06467ba8f42e1f2178246f";
+          sha256 = "11y11yybhb8wfj8qcj4gw8rhhly7kjs7ylyxwsh7qnfgq6f771qh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat";
@@ -36461,12 +36524,12 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20161017.613";
+        version = "20161027.625";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "483805b938a3fe543e075cbb60eefd4af805ad23";
-          sha256 = "0diyvgm5y8iw0zsg4vjzv74kgzib0mspw4b4di06rg1gs7ivfl8r";
+          rev = "feb6e79dddc8f992f85ae8c955ce024d57ec5e26";
+          sha256 = "015y0y5xx7b3iky3r9gdnkh4kq1nxvdshvmlb0yy3mg71s62xi76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -37237,8 +37300,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "57dd0d91b7e5cf79da3d8e5c314c4fc083e418e9";
-          sha256 = "11m239xgfpvfkjl3scbm1wf21ahp5fz1m7g10qjpa9ls7k1jni46";
+          rev = "08ae6e1d290f40cd7649629436372ee6a52a7735";
+          sha256 = "1bzbrwpnzwbym8y17m3298nnl7c3fcb1ib8689618jla0f74w6qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37880,12 +37943,12 @@
     leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
     melpaBuild {
         pname = "leanote";
-        version = "20160905.1849";
+        version = "20161029.756";
         src = fetchFromGitHub {
           owner = "aborn";
           repo = "leanote-emacs";
-          rev = "7aa69b38d16985943c398bf10f3961cf59b54835";
-          sha256 = "0iif540czjvikqk9dhdhrvkw372zdgsm882nzxpqiq81diw3chq2";
+          rev = "f5f0ed732e8fb2316591e5152306e090774c4d49";
+          sha256 = "0cj8nd63sjp8iysmxl1a1qqb5qpmmd95yp5g5b1g4ikak17mx2vq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
@@ -37901,12 +37964,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20161003.916";
+        version = "20161030.1103";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "c46efbc497b51223c2276d1e23a9fcf1ea440634";
-          sha256 = "1z9776k6swm3nvy81i3mnrsn472d8wd9p26gwy6zgidi7k9sj3k3";
+          rev = "20901f226c0fc32dbd2a2836bdf6525389205313";
+          sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -38090,12 +38153,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20161018.1057";
+        version = "20161030.1205";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "05763cc1896c93ef0ed1df2f07e210137fad33d1";
-          sha256 = "0z0lxcnmvw1vdfrf2rcsskyxj28x1m7m5732yfyjzdnwywwvrwm1";
+          rev = "db7181c9ffce2e5f3244344440895df4e08bbcc1";
+          sha256 = "1nka98zp1xmk94vv1vxd5ymkpprs0mgss4zxny87jax8drmlbjbd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -38154,8 +38217,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "8cf18f7a2172212e5cbd295bf9a573896596a70e";
-          sha256 = "1mrqxlbhvzyz69axp4yvckms8lzrbqb9jyd539dv2dmml9mb7xbr";
+          rev = "82636b12d82b0e3be076b69bfc31bb3507ba3530";
+          sha256 = "0bjx08s95xklq6qszg1p3gl62c4y3kacwvz61ywgchhxvxdwi450";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38467,12 +38530,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161019.2038";
+        version = "20161026.1538";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "a8c9c82c7354cc09ad98ea5a7475ec51a6a638c5";
-          sha256 = "0sdhkw0krk1d4p2s3xzfyx84icm3k3ka1qv52c6fzj92pcv6rfap";
+          rev = "fa1aaf0be0102ad5bedcea1154a62746f6457379";
+          sha256 = "16hcy02jx4f3m6ps8m6sxks18a9mzagn262wcvf8vq3q1iargwai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -38867,8 +38930,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "05c107461ec2f9e25bb45e124186accc89f2c59f";
-          sha256 = "1apsp79k5javfm8775yd8vy26xq6jlsh45nfwllpnk3zwlaiwa2v";
+          rev = "7e057dcd4e19ef38ea59c2dc00fb13bda64c5ecf";
+          sha256 = "0i8n2yiv3bw8jg5w2lzdhj9ycklkpwmvyxl4swcsslc8mp56368g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39486,12 +39549,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161024.155";
+        version = "20161030.317";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
-          sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
+          rev = "63e2c3af0d39530802dccc5d23df293753947a6c";
+          sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -39665,8 +39728,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0";
-          sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr";
+          rev = "63e2c3af0d39530802dccc5d23df293753947a6c";
+          sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -39766,12 +39829,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20161013.2332";
+        version = "20161024.1527";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "78b1046f5c98e0286f1c48bd816eafd16e70d35c";
-          sha256 = "0jwqs508aipxb05y9qljpfqkk2m69iavg716h93qn4lm6mvnl668";
+          rev = "43bff16701daac38fb08c87bc60874bb4b1220f4";
+          sha256 = "14r88xh3rwbr4kns487928pbh48mdwyg4qhr5wzj6yqb3kj0816j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -40372,27 +40435,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "marmalade";
-        version = "20110602.1622";
-        src = fetchFromGitHub {
-          owner = "nex3";
-          repo = "marmalade";
-          rev = "2a4f07fbd4c17e08556c1a80c1753c37b3626d39";
-          sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade";
-          sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
-          name = "marmalade";
-        };
-        packageRequires = [ furl ];
-        meta = {
-          homepage = "https://melpa.org/#/marmalade";
-          license = lib.licenses.free;
-        };
-      }) {};
     marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }:
     melpaBuild {
         pname = "marmalade-client";
@@ -40539,26 +40581,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
-    melpaBuild {
-        pname = "matrix-client";
-        version = "20161004.1933";
-        src = fetchgit {
-          url = "http://fort.kickass.systems/git/rrix/matrix-client.git";
-          rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d";
-          sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client";
-          sha256 = "0znm8b1hd7iyb84qzxs25y850cbxxmydyzr7kx094rji55685c68";
-          name = "matrix-client";
-        };
-        packageRequires = [ json request ];
-        meta = {
-          homepage = "https://melpa.org/#/matrix-client";
-          license = lib.licenses.free;
-        };
-      }) {};
     maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "maude-mode";
@@ -41120,12 +41142,12 @@
     mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mew";
-        version = "20161011.1859";
+        version = "20161030.1807";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "eb3cb8f25f20a0a241f88ec48953cf49ff43a116";
-          sha256 = "1bnkbd448apnh244napsv28zvfcqczgsc0ly3fjh1qc2kfihx978";
+          rev = "15469053c8d7996b82270179d879d6e1e038282b";
+          sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -42111,12 +42133,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20160808.654";
+        version = "20161025.621";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "0b9b043f042145bf62969add7ec476ea51da7cbd";
-          sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy";
+          rev = "fd742eee779c16f608d2369913ff067e1c47261f";
+          sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -42294,12 +42316,12 @@
     move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "move-dup";
-        version = "20140925.808";
+        version = "20161026.742";
         src = fetchFromGitHub {
           owner = "wyuenho";
           repo = "move-dup";
-          rev = "964d1bbaacd4559d2dbde9cb44015c400d5a71b5";
-          sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
+          rev = "612f5b3faa5bc36f7403b6fac7a1a524ae146f37";
+          sha256 = "0xiwlqhhx9aqj4059srp04zw1nksf8crp1z1wcfn4516f8mxs66p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
@@ -43726,12 +43748,12 @@
     nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nemerle";
-        version = "20130328.746";
+        version = "20161029.1323";
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "97c18aca4d29d7f183437b2bfdfb8193cc47162a";
-          sha256 = "0nspqnv5jk59r9l8mnca0d3fkyybhnrbm6jbghyv7z35xfh5n0bn";
+          rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0";
+          sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -43768,12 +43790,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20161013.808";
+        version = "20161028.2314";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "7ae38b71faf7878eac01cbb82c9819c903e5cd6d";
-          sha256 = "0bzmv6ds74f1y4w81v59wikraqzjjsd2minzjk7xqp6iiv2i7rgh";
+          rev = "991e1b8cb7cc3a0bbb9aa8fb109800b46b6cf3b2";
+          sha256 = "0v4l4y4zwp93dgvlca23f6y9kgkzvv7i3cmvb6s5jki5syb86r3m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44066,8 +44088,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f";
-          sha256 = "0g420z3n0yspks0zy5ky529gbwriyrp702glslwq27ndl38aiiza";
+          rev = "18b7363a699c0b5a4bf59d2b320dfc2b84dc4e67";
+          sha256 = "11g99aw84w1as4can3184ns2znwg7knp8jnp7y3halm0bw1p1s63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -44227,22 +44249,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    noctilux-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noctilux-theme";
-        version = "20150723.747";
+        version = "20161029.810";
         src = fetchFromGitHub {
           owner = "sjrmanning";
           repo = "noctilux-theme";
-          rev = "5f21c8523ddb99c4e5bc727d59ddf6bf6f50d626";
-          sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
+          rev = "8980a500eb2613771c873c78499a1f8a580fff9c";
+          sha256 = "1qfwra5q6k3p5p2i35pzs3hcksvpg1f5nk4q4qrkqb8flypfasdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/noctilux-theme";
           license = lib.licenses.free;
@@ -44332,11 +44354,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20161022.847";
+        version = "20161031.410";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "9be349c20faea4b119c69ec63a39476ec9570d85";
-          sha256 = "1l2rmi6mc6iqvr2iizfai3apwf6qads9il05v8rmsh1s0278p8w4";
+          rev = "429c30c2bc6587023f234a8a801f9ad5ce7076c0";
+          sha256 = "1p8qv1y08yychsrmf3f3qjyiiisgjvd4h1slhn3zyk0bhif1xqvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46158,12 +46180,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20161022.624";
+        version = "20161025.1203";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "ebb5c949cb505248619e24534de9d9a19fa2979a";
-          sha256 = "1clykj4ijm1pp3phhmm52w0vnz4ilhp8hb7gmfr0xvqd14cr9aq8";
+          rev = "dfa1aa2f1b802819b8d6baaae4ee1a43f2fe925a";
+          sha256 = "1whvqh76nqjmihgph2n0lasmvgb2zvd1pn98wyb3rw0h4hqyhlx3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -46641,12 +46663,12 @@
     org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
     melpaBuild {
         pname = "org-evil";
-        version = "20161019.802";
+        version = "20161029.222";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "org-evil";
-          rev = "d5c48f2f03b7aa85aa0ca850735ecb3539b21389";
-          sha256 = "1wl5v5f60m6dm6ca8pv7k5myr6y3dn7s2w3rdaz9dqpprxxpqh62";
+          rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc";
+          sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -46895,8 +46917,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "359afa68060cee6a72707f53d69e1f9244cbc50c";
-          sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50";
+          rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3";
+          sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -46915,8 +46937,8 @@
         version = "20160808.220";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "359afa68060cee6a72707f53d69e1f9244cbc50c";
-          sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50";
+          rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3";
+          sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47043,27 +47065,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-pandoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "org-pandoc";
-        version = "20130729.1850";
-        src = fetchFromGitHub {
-          owner = "robtillotson";
-          repo = "org-pandoc";
-          rev = "84b5df1f5516704540e19e048e18f437dc090a7d";
-          sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2952138e5c4d0a075925ed2ee17daf941deaee2/recipes/org-pandoc";
-          sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
-          name = "org-pandoc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/org-pandoc";
-          license = lib.licenses.free;
-        };
-      }) {};
     org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
@@ -47282,12 +47283,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20161023.1844";
+        version = "20161031.813";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "95a75c1a14ce347b801cc346ff39462fdfb785bb";
-          sha256 = "11y8kfyfdzq6jx0mdnarac39jz8vk1b3bhbiiidaqqrjy31g427d";
+          rev = "c295ff00ccc9e29a04c981cd2631d7428b5e5e63";
+          sha256 = "1jbpnlli0g2kbsqrl3miwfjhfjf9zz9dlhbqd9fi891khyy5c6hm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -47635,12 +47636,12 @@
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20160904.122";
+        version = "20161030.100";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-webpage";
-          rev = "4c760fe11a6ca6b58e821753d648a6c8d3df4b85";
-          sha256 = "00s7hzps7qr91i6hdkf96r253286d6j0gq5h69ia2jnp15827bgj";
+          rev = "6a3c80ec00bb16707def17138e4230221511df3a";
+          sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
@@ -48244,12 +48245,12 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20160416.846";
+        version = "20161024.2158";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outshine";
-          rev = "61b2df38068ebd2fd12452485916eea2914daa3b";
-          sha256 = "1smfdfw0swvfbqlxi7nkrgbmfqhs0x47ky6xhgf38la1s6ivh29n";
+          rev = "d45a512d149996ca232c0218e2d6b5bc802285a9";
+          sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine";
@@ -48374,8 +48375,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "bdb140750528d54200771e1d43a644a8c0692a5f";
-          sha256 = "1cqvbk92cfr4p3i884vqi6hz1f67hkpcbvj71rx1z1x0vvs75505";
+          rev = "8e7eb1ea80d2f11f7fc7e70e7418f79905dd00c3";
+          sha256 = "1dbk37x5aaql03y97daqvw7nd70bym0cn93rad9m81djnhg46li3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -48395,8 +48396,8 @@
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "8fa2c82e4c1d52381d4528fdd7acd234cc75e380";
-          sha256 = "0hga00njg914wdpib7jc0xkw4pq40q1rcxqj6i9dsp4kl0h15wq1";
+          rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73";
+          sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -48475,16 +48476,16 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20160426.553";
+        version = "20161026.429";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "c4b8fd30c3bc48621759c9d128644d2d386e591e";
-          sha256 = "0csl9fcfwnpl6x3ld7xrlvgz6gwmgcd15a4zdc570w8vp26ra5k9";
+          rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61";
+          sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6905c43603bc3d64dfd04a5dbb25c9ac78e68631/recipes/ox-jira";
-          sha256 = "0bm7i1ambd71xmy1y9jcdh52irgcsziwwb9d3y3rq0pnsqv5cpvp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
+          sha256 = "088ks14d7slgs2qsqp1kkxvqzzhdkwphdvpg27ix686dz1krxxib";
           name = "ox-jira";
         };
         packageRequires = [ org ];
@@ -48874,12 +48875,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20161024.443";
+        version = "20161027.1828";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "e821f61f2cff31de6532d10c72a2527c50f0d4be";
-          sha256 = "15dygw0kd73n159axxhrwgr75cnvynk9gi99kljr09yr1pc11vpg";
+          rev = "e7c411ecc54445a62300576f83e36ce552d592eb";
+          sha256 = "00mvszyfyw08d16qy3nm125z71jd35j12vhrznvc2jcz17pgnnw0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -49102,12 +49103,12 @@
     palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "palimpsest";
-        version = "20130731.821";
+        version = "20161029.400";
         src = fetchFromGitHub {
           owner = "danielsz";
           repo = "Palimpsest";
-          rev = "69fe61494bfd24305bf7e387fa716474918eafa2";
-          sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
+          rev = "7f5f43080155c53099f3174cb09684d77924d771";
+          sha256 = "1z2acbmxsxfcw5d39zdzhg6l3r24m22nrfrp18j52d4i2jqawjfa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest";
@@ -49165,12 +49166,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20160902.126";
+        version = "20161027.1129";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2";
-          sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0";
+          rev = "2038ac386a20caec6f5a6477fec253f186c17715";
+          sha256 = "00yr76pqcizxpi0p3a9r5j9fgfxf40srqgfpvdhbky63xmnq6ckx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -49331,12 +49332,12 @@
     paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paren-face";
-        version = "20161008.1400";
+        version = "20161028.1127";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3";
-          sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw";
+          rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf";
+          sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
@@ -49373,12 +49374,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20161024.750";
+        version = "20161025.845";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "42fee8539ee71471531814466b9a7ee20af523d4";
-          sha256 = "0y26sg8qdvvhn1ya71abi58x99yl78pf78rkj3npa9vds3a718pj";
+          rev = "b593725f5e6ac5c65866055df75b39d0b5fdc1fb";
+          sha256 = "0d7ipf558141gf0qk82rvzfffmfa4vzn1yha0hza2fx8c0icv38l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -49436,12 +49437,12 @@
     parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsec";
-        version = "20161021.1405";
+        version = "20161027.1726";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "8c108be16dc07340d7681bebfba52649821e5d63";
-          sha256 = "1h564hjhqyb5l39nmin6k4n50qh18rryy8giwhgnl6pkr1fw7fdl";
+          rev = "21f5a117a054d1d21af51b0d92e7fa40b056a7e9";
+          sha256 = "1fmsaf4fgg9nkwbrjafvfgsscgspggxbrbg32kpc2db5lcmi6h7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -49770,12 +49771,12 @@
     pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pcap-mode";
-        version = "20161011.638";
+        version = "20161025.748";
         src = fetchFromGitHub {
           owner = "orgcandman";
           repo = "pcap-mode";
-          rev = "f681f074a335f40cf355171ecd05ebc8877642b0";
-          sha256 = "10cj12bv2m9x1fmwi6s0awgsq9bqmrjnrgxmyp203c6yp9gbhv74";
+          rev = "52780669af0ade136f84d73f21b4dbb7ab655416";
+          sha256 = "1v218cjs0qy3ac0rbzm22y1x388nxnf0pslh9jrvlymkn227pjs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode";
@@ -49959,12 +49960,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20161018.353";
+        version = "20161026.1557";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "249cece6cf0746924715990283cefe1d9b1ae093";
-          sha256 = "0l0p9s88b2bi3hdm7w5h3jbgrv8170yijq0d4h9lhijsymjzmg98";
+          rev = "9696abb82e427670b8283599365a234ddaa170b4";
+          sha256 = "0jmpvwar5hks2qbqkfabqw16zj9iyl99c79h6vm2z7jypsmzc8mp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -50210,12 +50211,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20161024.704";
+        version = "20161025.507";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "f6327c5052e1efa392353b6398cdc4b12c4fe17a";
-          sha256 = "01902jlmin93j5wzhbl0dmzp836q7mrq4yvx01rggjbzd51pijw4";
+          rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a";
+          sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -50315,12 +50316,12 @@
     ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ph";
-        version = "20130312.1137";
+        version = "20161029.822";
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "ph";
-          rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe";
-          sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
+          rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f";
+          sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph";
@@ -50966,12 +50967,12 @@
     pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pivotal-tracker";
-        version = "20161017.2054";
+        version = "20161028.618";
         src = fetchFromGitHub {
           owner = "jxa";
           repo = "pivotal-tracker";
-          rev = "1d43a5908a21853d595cae79c58caadf2c7c0a07";
-          sha256 = "19sf59f888pp8m11j9xbsrckw3750c7894nr4dcacwv90i0qwpw0";
+          rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c";
+          sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker";
@@ -51113,12 +51114,12 @@
     planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "planet-theme";
-        version = "20160821.717";
+        version = "20161030.1917";
         src = fetchFromGitHub {
           owner = "cmack";
           repo = "emacs-planet-theme";
-          rev = "4a3517728e009fb025d3f727eec4ea87b876aa2c";
-          sha256 = "191cyq2q2ybrpqjb4hlqjlmpahdaxm1cpg1414x7xlnpj45chc1c";
+          rev = "b0a310ff36565fe22224c407cf59569986698a32";
+          sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme";
@@ -51341,8 +51342,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4";
-          sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz";
+          rev = "0d6986cf21b19174b6591399adc1dfb670828053";
+          sha256 = "1xdjipwwhgvi38bw514hfd59r80dcg4jhm69ii4v06kkybfgz3wy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -52477,12 +52478,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20160923.708";
+        version = "20161024.1043";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "c3a54723005d015d5d4364e4c74617dfd10ee294";
-          sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0";
+          rev = "168ab64262d5927520a838bb659ab38b4f001eee";
+          sha256 = "1lkzl5svc2xff3ln2bcj9jxrvn8l00yyvd8nwjsad7ns44lfw5g2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -52603,12 +52604,12 @@
     projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }:
     melpaBuild {
         pname = "projmake-mode";
-        version = "20150619.1420";
+        version = "20161031.1015";
         src = fetchFromGitHub {
           owner = "ericbmerritt";
           repo = "projmake-mode";
-          rev = "25e2f28ca2c528e42c6422735829fc77bab8b451";
-          sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
+          rev = "a897701f7e8f8cc11459ed44eb0e454db2a460c1";
+          sha256 = "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df23138073d2416fa6522beca86b7a62eb4d42e3/recipes/projmake-mode";
@@ -52733,8 +52734,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "58580da37357941d502805be3ae520441be77728";
-          sha256 = "1kbh8km3zgs7znj88wq6zsk6gj7i2c4qz4520m2ycy3ba2wsxs6n";
+          rev = "8fcd24b8dbba46748a9d880a2372736a8b1a6852";
+          sha256 = "1kjd21k1xikzq5zm9ybza8qgf64xa9yg44pmhinidyx1vwdhz364";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -52939,12 +52940,12 @@
     punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "punpun-theme";
-        version = "20160527.230";
+        version = "20161029.1305";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "punpun-theme";
-          rev = "48ae2f9d9092b65cf3b4816cdaa6bd52efbd8d45";
-          sha256 = "131si1wqv0wvdgwbw58y8w90v6z3nd5rf293144brv9d8853icpy";
+          rev = "064e5d10ece4298bb5605259e4558421d0097caf";
+          sha256 = "19dbzrn7ghrxnvir65x4zmqv1yr7rcr35z9ckgy564nwnp90v2hn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme";
@@ -53446,8 +53447,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "bbffb9b1d160f4d7aacdfe5d3d729abd06766371";
-          sha256 = "0ghkslnx07iz0xd1dqgm47imy6030wrwrq99zgnqp8b1ylyz5vmh";
+          rev = "3a83a093d14d59d5026c0beae6bf025fe6b4ded7";
+          sha256 = "1y9dpp52xyc7aqqs3mpbi1qn661sgi2f899ppi495wqvlr06fpjm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -53631,12 +53632,12 @@
     python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
     melpaBuild {
         pname = "python-x";
-        version = "20160923.548";
+        version = "20161029.531";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "python-x.el";
-          rev = "d9827cbf410717cd2d6f5f64a70ee64e9ae5b8b3";
-          sha256 = "0ggbzjgqgwm0858gp2iyv0zh5337jv2kaswy8af2yqa6vm0fr7gl";
+          rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5";
+          sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
@@ -53967,12 +53968,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20161022.1923";
+        version = "20161029.1105";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "5279cda4a9385130cf7cc97bbdd33260deb0720d";
-          sha256 = "0bjskvkcy1m2k436dwc3aa25pkiqgbl0z86bsm9jaxhcq0122vq0";
+          rev = "7b0b8185a12491897c9c6dc83fa5f20c90a67f22";
+          sha256 = "1bwp6z2j3ppvv83cqrnan489xcw75ck48y09km3xpngr5d68ph38";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -54048,6 +54049,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "railscasts-reloaded-theme";
+        version = "20161027.1033";
+        src = fetchFromGitHub {
+          owner = "thegeorgeous";
+          repo = "railscasts-reloaded-theme";
+          rev = "d531e5523f35ee937f25931ea7c0dbf712274840";
+          sha256 = "107qg9k87caz9kdjsm0q90g3dnnlkm9m6fincvyz0rb45ns2iq5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
+          sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz";
+          name = "railscasts-reloaded-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/railscasts-reloaded-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-theme";
@@ -54937,8 +54959,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "e4b6e1e482c1a82cade511956b2453b18c50bf26";
-          sha256 = "17p07i8z5y2bp923i9sbplq9jn6p5kwscdf6725d7721n0ablpaj";
+          rev = "93684fa8ad3dc16b3e298386e857fa822ce7a36e";
+          sha256 = "1biwpmv51i5vnrv8m6j21rcqscdzvwryf0wrnx1s13ql5cq880ca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -55016,12 +55038,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "20160924.1555";
+        version = "20161028.1638";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "d1f5ced303957ce602385d6491e25cf1b0068d4f";
-          sha256 = "1liflg4nnwy4ara41s1c91g1ahlz9p7r500rbkx201lknspavpkz";
+          rev = "9582e47507237dad3513bc6957b35abc432743cc";
+          sha256 = "1bcm26mghknp749b3n0v4w7ag3c2q2g30d3j1zypslxcwgllzxs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -56119,12 +56141,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20161018.1119";
+        version = "20161028.1136";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "5f5c617b1b58fa63c852c9170c040274d28d694d";
-          sha256 = "0qhj3xysq4xzi6bgsnn484r1h4s8zdym0l98znlf0jml9bzczr74";
+          rev = "7cf1d49d9090449c660d024eecb782d3d4fd6aa0";
+          sha256 = "1zdmpspghmhrizz6zrilysh0x6704dpg2q0r33h27hhd1lak8091";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -56185,7 +56207,7 @@
         version = "20160911.333";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56485";
+          rev = "56534";
           sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
@@ -56265,7 +56287,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56485";
+          rev = "56534";
           sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
@@ -56492,12 +56514,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20160909.935";
+        version = "20161025.1042";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "1587839ba493b5ab98fb8415338172a9a22f224b";
-          sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3";
+          rev = "01ac5d8197658c21412acde16df7c39325f03e4d";
+          sha256 = "1pylp3xjj9asnnilx1rbghpqgmimvk74sz8fv1r341rlgy1arxrg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -56639,12 +56661,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20161019.446";
+        version = "20161026.532";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "ef0c1d2a7e8c162a18c27787ee8cde5b61586e70";
-          sha256 = "0jl0qwcbjkhnic91qwglaryddsc60cip24bsh2f5dpjsics7nh0g";
+          rev = "ca8930f2f7ba3dcfa6b09d23b9f4cdc5c466d141";
+          sha256 = "0mmbx11k8w26mc4f1x43l9nai6s37yjr98wrl4dgz24bg1qh27q1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -56828,12 +56850,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20161006.622";
+        version = "20161026.350";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "4e21f0673d39231fec070abfb24ab0c18948eb5c";
-          sha256 = "1ymkph8ikcsall9waq3vxac8jkji2bl9676pchydqr4ajc3aw8xm";
+          rev = "dbca1e2ae1b91ccb2bd10c4231fd01b47c0c6801";
+          sha256 = "1216lmx6rwm61kcv7mfp6k1vgln4bbibx77swxr66d0a2qil8rv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -56853,8 +56875,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "cfd46eaa3ab17ff4d1f8cdc348f35d2f9b63c0ce";
-          sha256 = "1901y4faw2w29wws26zlhs2lq9md1pcmd1c57n4zjzsp65kdivjg";
+          rev = "9e4da33eeebc1a1dee09772d5c2fc9ad13519deb";
+          sha256 = "0z025cnb4rfw3gcm2897245hy8png76ax035nmcz5hp4lhsk11l6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -56972,6 +56994,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "schrute";
+        version = "20161024.54";
+        src = fetchgit {
+          url = "https://bitbucket.org/shackra/dwight-k.-schrute";
+          rev = "1bfcd4a24ac833448355facc82255344d61d8fa2";
+          sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
+          sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy";
+          name = "schrute";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/schrute";
+          license = lib.licenses.free;
+        };
+      }) {};
     scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scion";
@@ -57284,6 +57326,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
+    melpaBuild {
+        pname = "sdcv";
+        version = "20161029.1945";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "sdcv.el";
+          rev = "62235bb69b903a5b191ff9935616dddf15fed52c";
+          sha256 = "1y2a7132xsi10j9mx0mrpkp947h171rp67n04q0y5smjapvgjjlf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
+          sha256 = "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a";
+          name = "sdcv";
+        };
+        packageRequires = [ cl-lib emacs popup pos-tip showtip ];
+        meta = {
+          homepage = "https://melpa.org/#/sdcv";
+          license = lib.licenses.free;
+        };
+      }) {};
     search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "search-web";
@@ -57614,22 +57677,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    seoul256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seoul256-theme";
-        version = "20150714.1535";
+        version = "20161025.2120";
         src = fetchFromGitHub {
-          owner = "ChrisDavison";
-          repo = "seoul256.el";
-          rev = "32790703847b868e8fdd9c0736b0b8a0167f97cf";
-          sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
+          owner = "anandpiyer";
+          repo = "seoul256-emacs";
+          rev = "2ae4dcbbc62a3befe63d6294b0132cf28076bf80";
+          sha256 = "1cchzy8vclwi8fcic54i6hqklwd57l6j6604lii8a4gcr4mhixdx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1aff32f498ec4fd765c346f0c9da44cf919723f2/recipes/seoul256-theme";
-          sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme";
+          sha256 = "058fadcqz21c22lzf33badibb7hn3w695akh560v10n8750h5wca";
           name = "seoul256-theme";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/seoul256-theme";
           license = lib.licenses.free;
@@ -57741,12 +57804,12 @@
     seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seti-theme";
-        version = "20150314.122";
+        version = "20161028.816";
         src = fetchFromGitHub {
           owner = "caisah";
           repo = "seti-theme";
-          rev = "f2f472af00f251f8cdced29faadbb3380d3c7ff1";
-          sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
+          rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8";
+          sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme";
@@ -58029,12 +58092,12 @@
     shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-switcher";
-        version = "20160111.2335";
+        version = "20161028.2252";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "shell-switcher";
-          rev = "bdf28e10a05d7187a4c4440d164ae08ba943b856";
-          sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
+          rev = "28a7f753dd7addd2933510526f52620cb5a22048";
+          sha256 = "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher";
@@ -58113,12 +58176,12 @@
     shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shen-elisp";
-        version = "20160624.340";
+        version = "20161030.1115";
         src = fetchFromGitHub {
           owner = "deech";
           repo = "shen-elisp";
-          rev = "822d2e4e791e883ba38ac8bed483a908c60ada1a";
-          sha256 = "0zpd1jpyw1243nk7m89x45kn99ly9b64p365v16gdhng3yk2l02c";
+          rev = "e7c3da5d817c90588ebc276bd8defa9d497baf69";
+          sha256 = "00isccj80g0qdjd15bl2dnlxqvmz2p3nih6v9ljx3vs2jb43pibx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp";
@@ -58259,10 +58322,10 @@
       }) {};
     showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "showkey";
-        version = "20160816.2247";
+        version = "20161027.653";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/showkey.el";
-          sha256 = "1aipl39lh2kym5pc7a8z5sznrrssz327spd6y9cf84agy2k7mv5d";
+          sha256 = "0nqf2pdphc820faijnarg4mq3zblsl2dj3scralhxnqwl68ky7ch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey";
@@ -58861,12 +58924,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20160928.2036";
+        version = "20161026.857";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "c38db1a8c85e6c5940fa14aefd6a767b5e668c9d";
-          sha256 = "03a4vk3dbxnyar7rswnnwxazp4pxkxgwqc3akn7ilhdfmx817rrq";
+          rev = "c2ac34937ea1ec6e8552405f1b35f2523a0a0a3d";
+          sha256 = "0s9c067g8b17njjxg31abx4zklfy6azy2c7dgq636pdql06fbv17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -59613,12 +59676,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20161015.1227";
+        version = "20161029.837";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "768ad1a44e9b4aa49a8539a8353087cbe99eff21";
-          sha256 = "0y4gwsdrmxwy017cmabfkmc8q2va13kjxw2zhmn4nz7ykih2pq1h";
+          rev = "78a0880499915b52549aacc5de473c6ecccec88a";
+          sha256 = "1hfgklrdjlvx3sfnamfs0wv349yy6166x8j240xjsf24gl3yh4jh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -59847,8 +59910,8 @@
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "smmry.el";
-          rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
-          sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
+          rev = "986a1b0aec8ab1ef17dbfb7886f47e5558cf738a";
+          sha256 = "1gq2066js1kf035217z0n6w0bf0dsyskykf56xycci5s1i7xv2vz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
@@ -59969,12 +60032,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20160913.2031";
+        version = "20161026.1857";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "2bceb7f266f71cd85f9b328de02797eb457da17c";
-          sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys";
+          rev = "d8012ab4661630283c4ac6521a094cbe09ea4707";
+          sha256 = "0q7l82zyk0ibk4hby8m014qfjrpyjp15n92p2j3n7hp9fm8fij8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -60480,12 +60543,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20161023.535";
+        version = "20161024.1259";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "db781c348b2ecdf871445986ef1cb2783c867ea0";
-          sha256 = "0zwap27k3gqkzbdg3wsysb34gc540imimagy38l6gin7g0a315ja";
+          rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326";
+          sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -60564,12 +60627,12 @@
     sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20161015.1256";
+        version = "20161029.531";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "6f1bcf7a6a03e53de24d3d1c49d4186525764f0f";
-          sha256 = "15xq91qyj5nw03zr343s0r5x60p4a702bdv9k0pgm85787jrfr86";
+          rev = "74b901d5689ee4864c4d552d7052b8f128f77339";
+          sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -60686,12 +60749,12 @@
     sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sphinx-frontend";
-        version = "20160606.820";
+        version = "20161025.58";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "sphinx-frontend";
-          rev = "e483773ac6b1366ca43128f727e2b3cc2269997f";
-          sha256 = "0k8dpqp6hzycbd504zkp7j5ar2zvf6lnn0p60i392g9pj573fnsh";
+          rev = "0cbb03361c245382d3e679dded30c4fc1713c252";
+          sha256 = "1ksjgd995pcb4lvwip08i8ay0xpin8dcam3hcgnbjjqjg9hja1cf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf72e71f159b9eaaa0834682d5dd4eb258616cf/recipes/sphinx-frontend";
@@ -61102,10 +61165,10 @@
       }) {};
     sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "sr-speedbar";
-        version = "20150804.951";
+        version = "20161025.131";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el";
-          sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
+          sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar";
@@ -61433,27 +61496,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "stekene-theme";
-        version = "20141108.1211";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "stekene-theme";
-          rev = "45b643a5af7dac70997d6a60e69c2f2473337d98";
-          sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme";
-          sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
-          name = "stekene-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/stekene-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "stem";
@@ -61738,6 +61780,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    stylefmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stylefmt";
+        version = "20161025.124";
+        src = fetchFromGitHub {
+          owner = "KeenS";
+          repo = "stylefmt.el";
+          rev = "7a38f26bf8ff947215f34f0a064c7ca80575ccbc";
+          sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63af0555576b0430f46d7383d7ea56e1789f43e9/recipes/stylefmt";
+          sha256 = "17jj8n8x4ib51a6jdsywcssi6cvxmql9sk7f5clmbi94qxlh48lr";
+          name = "stylefmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/stylefmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
     melpaBuild {
         pname = "stylus-mode";
@@ -62345,8 +62408,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1";
-          sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr";
+          rev = "df9ad89bec43777513b3f0efe031cd81dcf47820";
+          sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63474,8 +63537,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5";
-          sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v";
+          rev = "1b059a9fb324edf0804a9414cfabc6e26c813398";
+          sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -63495,8 +63558,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5";
-          sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v";
+          rev = "1b059a9fb324edf0804a9414cfabc6e26c813398";
+          sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -63904,8 +63967,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "59cb6661bcee265d39ad524154472ebe27760f1e";
-          sha256 = "1dsl3m2l8qh3qp7nnavmxmp50cib8zf6vmd28i9s31cxbm479x90";
+          rev = "74c99ba38b02288daf05229cdf34e60261d2d01e";
+          sha256 = "0l0ffczgpsvp6znlnnc89nxcmw6yzmxn4dbsr0px3pqz1mffgyp1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -64773,12 +64836,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20161021.904";
+        version = "20161027.848";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "a84c48b3c3fbbd56aa990f1807670f5cdb28c0ef";
-          sha256 = "0fppkpy5brxx79gglga510swnd0fiw43i87zisvc9ivykbigiys1";
+          rev = "6ea2305e267e5efb42bfa2187279ea3b7d1a555e";
+          sha256 = "0p81gdrbwvba7xnpapgwrmssizkfj4rwxxipr76c4lzdmz1am03w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -66086,12 +66149,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20161017.1640";
+        version = "20161031.1025";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6";
-          sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk";
+          rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f";
+          sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -66398,6 +66461,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-fossil";
+        version = "20161030.842";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "vc-fossil";
+          rev = "066a1c591c18102d199407e303ccdd0dd8c26be9";
+          sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil";
+          sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081";
+          name = "vc-fossil";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/vc-fossil";
+          license = lib.licenses.free;
+        };
+      }) {};
     vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-osc";
@@ -66968,12 +67052,12 @@
     vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vlf";
-        version = "20150101.718";
+        version = "20161030.840";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "vlfi";
-          rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
-          sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
+          rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0";
+          sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -67007,12 +67091,12 @@
     vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vmd-mode";
-        version = "20160531.1719";
+        version = "20161026.1359";
         src = fetchFromGitHub {
           owner = "blak3mill3r";
           repo = "vmd-mode";
-          rev = "3f650c04dd1b823a4dc3c7e965ea50c1dfc5645c";
-          sha256 = "0wjfpgypdii7y2zp2c3yb6pmgpcza11ds2x3dya4syn6ll7zhgz9";
+          rev = "a332f96c38a512c645c110c04f4a8315429bd2e2";
+          sha256 = "15284r6hx96mwjigw13ikzqjm9irj4vklwsikawym37dyz75h4nv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode";
@@ -67254,12 +67338,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20161018.938";
+        version = "20161029.2147";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "5de8cfb87e6e5ed953aa229de0bf19a965367735";
-          sha256 = "1rwsi9d4lik5jx9y9fbknjkjqjpky2mc8piyziihcq3hk16vdkgr";
+          rev = "8cd89d439515331a96facdcf3eb3eb424819c2e8";
+          sha256 = "107p0yrfp4lpm1clzls78f8ylmr6fpjjz467pf0vyygnd5xhxf4r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -67359,12 +67443,12 @@
     wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wc-mode";
-        version = "20131121.826";
+        version = "20161031.648";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "wc-mode";
-          rev = "c465751b434b20f848f0b8fa2b4e2dec5717f217";
-          sha256 = "1j1k3ab0ymr66w23z3r4yd1g6410n5y80jfyg2f9i9rdk7vq18gd";
+          rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69";
+          sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
@@ -67799,12 +67883,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20161005.1154";
+        version = "20161031.1056";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "a6a9f352e735f3d7faf45d0e8f23f3a346c04f9c";
-          sha256 = "06h2yc73z4vj2pzf16v78whh83zrvv1zsl6hvhwylgys1vn2ssk5";
+          rev = "4b01b44c6718168be9553043124c3efd766abbc1";
+          sha256 = "0kjrwaarrwrnxqbq8w23fs2j9nfv394lzpkzzjpakaaqfbzc1ck7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -68336,8 +68420,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "b9e861ccb52d";
-          sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
+          rev = "9f38303df3b7";
+          sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -68836,12 +68920,12 @@
     x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x86-lookup";
-        version = "20160624.1104";
+        version = "20161030.1736";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "x86-lookup";
-          rev = "70c5b1092484a031f3a3d9334399f14aef449df8";
-          sha256 = "0q31mcz9bx19y517y1pli4znqxflvmvjf2k5wsi8sld7f5w4wwix";
+          rev = "208810ea93214491e6e2329cdbf81de85437939a";
+          sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
@@ -68857,12 +68941,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20161017.1807";
+        version = "20161025.341";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "33805b3ec7c8881c32584cdbfb1e4b2719b53d7e";
-          sha256 = "1ja8aqg01s9i5sa2prfr7f809ak42ic63jldw022z3jjag0qn7jm";
+          rev = "0dc80c428cc48dfbb411b77588db7030903705b6";
+          sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -68878,12 +68962,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20161024.900";
+        version = "20161025.338";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "a225039d38e5bb61ae89066e4528ca7c2d792984";
-          sha256 = "0qa6c498sm2sdh0pjci0hqpihp4ccs8hj1p7h3wks6kz3c3xr42a";
+          rev = "061d493b6e47aa96f9a3bea107b3586b21caab8b";
+          sha256 = "0vhp81gr9lhwbq237fixmwjq1kipl5d2apy48hicgdzi1a8wcahv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -68920,12 +69004,12 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20161016.459";
+        version = "20161026.2246";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "f9849ddd3b128628e4e9632e1e21edb8c904cb38";
-          sha256 = "14dc0lwmh4zf8whj3m65nsxvadqqmhr6kiymrx6vykwbsj4lzfiq";
+          rev = "161266e31b27fd060be56550f413e58e0436c04b";
+          sha256 = "0b4g9xvi9v6qy3ijia800ph6j7cq06k72sc56kb7dkcgnjk9nxcm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -69319,12 +69403,12 @@
     xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-color";
-        version = "20161013.1627";
+        version = "20161029.2045";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "9c850434b398f5e758b0e6ff6d9ce8f7351521f0";
-          sha256 = "14h46z8hqyx4135adj3lqbfpkaxlnvky7x4sfsnxbx82zqlcqnac";
+          rev = "89251eb9ddde4246e7c2b0a177706c6294ef4bea";
+          sha256 = "1sn95gzw6ivniwci9czmb8mssz4cqbbzr9clsdh2pnxxmx1kx3xd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -69424,12 +69508,12 @@
     xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xwidgete";
-        version = "20160719.324";
+        version = "20161029.1112";
         src = fetchFromGitHub {
           owner = "tuhdo";
           repo = "xwidgete";
-          rev = "943d715f2caab69f76d0de9bd4387cf60f6c4fe3";
-          sha256 = "0wrb8cvm3ap9y212z3fxc6shbzk0xv1jbw47rnbxgl97asq7rcaj";
+          rev = "adcf3f84772f4a382ba791a6584fa7dddfafdcdd";
+          sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete";
@@ -69757,12 +69841,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20161022.646";
+        version = "20161026.1601";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "eaaec309b19ea704dddb265bcd3d9e09c9996265";
-          sha256 = "1ckj1d053v74m2kchd2lbr3qrdmn0d7p9l0lwnpjl63yzvhkfjid";
+          rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
+          sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -69782,8 +69866,8 @@
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "90c14d2e2b8247eeba464a52560af484f8542558";
-          sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is";
+          rev = "da42cb16c4534eb31c5946bf7f5a5710ef57256d";
+          sha256 = "09ag32gbmidp12w3pay5iid6b75zwdm317hsz2kdvslik18j7r66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -69841,12 +69925,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20161018.2336";
+        version = "20161030.1222";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "adda8765e1c1819bcf63feefea805bd8c0b00335";
-          sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm";
+          rev = "140079b822452b141ce022bbf082deae17edd6d3";
+          sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -69955,12 +70039,12 @@
     zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zeal-at-point";
-        version = "20160725.2044";
+        version = "20161027.2344";
         src = fetchFromGitHub {
           owner = "jinzhu";
           repo = "zeal-at-point";
-          rev = "675ee27456fb454562b249cad768d4a5207a6b4e";
-          sha256 = "131q95x9zvzayfn0slyzjyl87fap9j16bfdlc449khfp0zymcbla";
+          rev = "2ca9f1070197bd6af7807bca6a1f2099c7b3ed1c";
+          sha256 = "1l7kzmhkjnfy32l0kw3xnqs3dipmsad2ckcx7plvfwfh75yrddq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point";
@@ -70079,12 +70163,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20161014.1000";
+        version = "20161025.916";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "166998e69a83535618dc4e79715e203fc340d513";
-          sha256 = "1ac5vqg9v6qj37xjw3xjlv47iyh5wwy59xwzah9pdi587224jcfv";
+          rev = "62fde99acdd1b1e149300903a7e4f03257019602";
+          sha256 = "0zi43l26fwqpd97bz4spwqr2k3df279m26wb74wygl5rkj1v01lk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -70452,12 +70536,12 @@
     ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20160925.719";
+        version = "20161026.1249";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "e5eb534859acc0cc0a13403fd166457db9fb7eb5";
-          sha256 = "158lzqsjpm1zlkq4c2hvg3s8z5yp30g0qj5wk2r1j3svfz4q9nl9";
+          rev = "6826c3f3f3735fbf060206072392d67f0990f817";
+          sha256 = "1ybrx6p9i55zsjnxa7cgali6x77aam2h55b8g5fqw23wnvr11x4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index aa9547d4b7b..6c1f92a69ef 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1624,6 +1624,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "atomic-chrome";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "atomic-chrome";
+          rev = "6fe75d409323554d4c4f35ac0e90963fe90d3a43";
+          sha256 = "0lc0j6ffd6cpqnpfvpqm7rfxblj34pg9vw3zs1hkg15g7qw0nh5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
+          sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9";
+          name = "atomic-chrome";
+        };
+        packageRequires = [ emacs let-alist websocket ];
+        meta = {
+          homepage = "https://melpa.org/#/atomic-chrome";
+          license = lib.licenses.free;
+        };
+      }) {};
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
@@ -3082,12 +3103,12 @@
     cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
     melpaBuild {
         pname = "cask";
-        version = "0.8.0";
+        version = "0.8.1";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24";
-          sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr";
+          rev = "58f641960bcb152b33fcd27d41111291702e2da6";
+          sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -3205,6 +3226,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "cdnjs";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "cdnjs.el";
+          rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908";
+          sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs";
+          sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
+          name = "cdnjs";
+        };
+        packageRequires = [ dash deferred f pkg-info ];
+        meta = {
+          homepage = "https://melpa.org/#/cdnjs";
+          license = lib.licenses.free;
+        };
+      }) {};
     celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "celery";
@@ -3376,12 +3418,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "0.5";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "915f77912f0f8cfe064c6872cae5c0709e4e094e";
-          sha256 = "004xnn6j4jc607h5qcl9jr0dqvhvqvgm77wrbdmdxpwd6hwp2sf4";
+          rev = "43931dbb96c3aa5df8dda030503f1458dc6ca1c5";
+          sha256 = "0kn3nsdlsgd6hlq7c32kp29bhh9zych727sbx028w1bidjsvjlly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -4077,27 +4119,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "colorsarenice-theme";
-        version = "1.0.20";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "colorsarenice-theme";
-          rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6";
-          sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme";
-          sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
-          name = "colorsarenice-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/colorsarenice-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "commander";
@@ -4716,12 +4737,12 @@
     composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "composer";
-        version = "0.0.6";
+        version = "0.0.7";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc";
-          sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778";
+          rev = "47d840e03412da5db13ae2b962576f0166517581";
+          sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -5007,6 +5028,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "creamsody-theme";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-theme-creamsody";
+          rev = "41164f285735383848aba1bfef4282bca4e9a8e8";
+          sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
+          sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
+          name = "creamsody-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/creamsody-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "creds";
@@ -5239,12 +5281,12 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "1.17";
+        version = "1.18";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
-          sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
+          rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041";
+          sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -5281,12 +5323,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.24.1";
+        version = "0.25.1";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "27d7795ce424cd710431c47ab4cb29111f1a3e9c";
-          sha256 = "0kddvsnc4a2ass4zfzrqp26jlbnqsgbv0dy9rmj3p2n61wqkw4wk";
+          rev = "278a567621d586af74a1c845de0a1426b686c72e";
+          sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -5927,22 +5969,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-icon";
-          rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde";
-          sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy";
+          rev = "7fc95de6d7722b304124a890e4fb577e16897b1f";
+          sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
           sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
           name = "dired-icon";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/dired-icon";
           license = lib.licenses.free;
@@ -6265,12 +6307,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "0.5.1";
+        version = "0.5.2";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f";
-          sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal";
+          rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
+          sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -6776,12 +6818,12 @@
     easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-kill-extras";
-        version = "0.9.4";
+        version = "0.9.4.1";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "easy-kill-extras.el";
-          rev = "242844bc95b9015396405d84c4335338037968c3";
-          sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
+          rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
+          sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
@@ -6860,12 +6902,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "2.7.2";
+        version = "2.8.1";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05";
-          sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph";
+          rev = "219665ba1c9aad885cee6e9914448139be7f7299";
+          sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -7194,12 +7236,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.10.0";
+        version = "0.12.0";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e";
-          sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
+          rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449";
+          sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -7467,12 +7509,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "0fd363d09150ad101edafca667dac82ffaec5adf";
-          sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0";
+          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
+          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -7488,12 +7530,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "0fd363d09150ad101edafca667dac82ffaec5adf";
-          sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0";
+          rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
+          sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -7572,12 +7614,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.19.6";
+        version = "0.19.9";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16";
-          sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b";
+          rev = "a842d54348846746ef249a87ac7961a9a787947f";
+          sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -7698,12 +7740,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.12.0";
+        version = "1.13.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "c9487a14e9cb21b531660de7e648086e270ab08f";
-          sha256 = "1x4asq5zqv8wbp034gzcrza9y2nbbwx1nrwi4jnwak0x0yn3c2dj";
+          rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
+          sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@@ -9418,12 +9460,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "2.3";
+        version = "2.3.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "981c80bb53384f93987d03c1b307767f2a68791a";
-          sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
+          rev = "54c618aada776bfda0742819ff9e91845a91e095";
+          sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -9859,12 +9901,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "0.7.0";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "eb7dac9dba845cd73b57b9046761804969adec11";
-          sha256 = "0ynd4mq2vckyczfblw3r92lcbn4518jh3mzv5r11drlra9sdjnl8";
+          rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc";
+          sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -10132,12 +10174,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.2.4";
+        version = "5.2.5";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "b69411d15902d9d1cbb0184885f726270de0b98c";
-          sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp";
+          rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6";
+          sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -10790,12 +10832,12 @@
     flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-rebar3";
-        version = "1.0.1";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "joedevivo";
           repo = "flycheck-rebar3";
-          rev = "534df87b0c2197fa15057f1e1a19763411c59220";
-          sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
+          rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
+          sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
@@ -11690,22 +11732,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
+    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.8.1";
+        version = "1.9.3";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "51bad86059528f1ce87ef12e1657531aa11a386d";
-          sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr";
+          rev = "d5b9fde6dec186972f6ea457582504ca813b8778";
+          sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
-        packageRequires = [ company company-quickhelp dash popup pos-tip s ];
+        packageRequires = [
+          company
+          company-quickhelp
+          dash
+          flycheck
+          popup
+          pos-tip
+          s
+        ];
         meta = {
           homepage = "https://melpa.org/#/fsharp-mode";
           license = lib.licenses.free;
@@ -13056,12 +13106,12 @@
     godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "godoctor";
-        version = "0.0.5";
+        version = "0.0.7";
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "godoctor.el";
-          rev = "de7f838af320c87f10cba17619492e072000c47e";
-          sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z";
+          rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede";
+          sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
@@ -13245,12 +13295,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.10.0";
+        version = "0.11.1";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
-          sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
+          rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185";
+          sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -16568,6 +16618,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "import-js";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "galooshi";
+          repo = "emacs-import-js";
+          rev = "5726c33b8d8c43974d4b367348962025c6df56b9";
+          sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
+          sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
+          name = "import-js";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/import-js";
+          license = lib.licenses.free;
+        };
+      }) {};
     import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
     melpaBuild {
         pname = "import-popwin";
@@ -16885,12 +16956,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "0.1.18";
+        version = "0.1.19";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "5378bb637c76c48eca64ccda0c855f7557aecb60";
-          sha256 = "1vgmbs790l8z90bk8sib3xvli06p1nkrjnnvlnhsjzkkpxynf2nf";
+          rev = "fe0b045aadef5590eb33e03c1512430e5d52d639";
+          sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -17492,12 +17563,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "0.7.1";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34";
-          sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
+          rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38";
+          sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -19540,27 +19611,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "marmalade";
-        version = "0.0.4";
-        src = fetchFromGitHub {
-          owner = "nex3";
-          repo = "marmalade";
-          rev = "01d6ddf5f0e822d6df393aa4546b069b2d6545d7";
-          sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade";
-          sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
-          name = "marmalade";
-        };
-        packageRequires = [ furl ];
-        meta = {
-          homepage = "https://melpa.org/#/marmalade";
-          license = lib.licenses.free;
-        };
-      }) {};
     marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "marshal";
@@ -23364,12 +23414,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.19";
+        version = "2.20";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2";
-          sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0";
+          rev = "f0fd4fe8b6cd368cab077177c3eb8be092856b49";
+          sha256 = "069crk0xdm061m4jipkgwh1n4845cpa9j7dvg8ngqzrd4j2f243x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -23572,12 +23622,12 @@
     parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsec";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218";
-          sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc";
+          rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3";
+          sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -25982,12 +26032,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "b59764e181990ddd3ab441cdc290b5fe178860f4";
-          sha256 = "1x5r6cb430hfbdqq3samlfkaawy49i1gi6mzai2061r780h7w4fx";
+          rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967";
+          sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -26882,6 +26932,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "schrute";
+        version = "0.2";
+        src = fetchgit {
+          url = "https://bitbucket.org/shackra/dwight-k.-schrute";
+          rev = "99857394886e516d5ebd63fedff200bceaef1d4d";
+          sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
+          sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy";
+          name = "schrute";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/schrute";
+          license = lib.licenses.free;
+        };
+      }) {};
     scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
     melpaBuild {
         pname = "scpaste";
@@ -28666,27 +28736,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "stekene-theme";
-        version = "1.0.15";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "stekene-theme";
-          rev = "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673";
-          sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme";
-          sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
-          name = "stekene-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/stekene-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "stgit";
         version = "0.17.1";
@@ -31148,12 +31197,12 @@
     wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wc-mode";
-        version = "1.0";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "wc-mode";
-          rev = "eb0b23e0de8bcf21c61c1edacd9fe89b2e6888d0";
-          sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw";
+          rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69";
+          sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
@@ -31462,12 +31511,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "1.1.15";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "1eace34a1f5b780a30797976d0cfec5936048b7b";
-          sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843";
+          rev = "fc7482e4a2063697738a405686ebc62d87697ab8";
+          sha256 = "1a52pc4iwr2mmby6h16vl436cm0psxnfgd3lhkqbq86sw3p78bx8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -31717,8 +31766,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "b9e861ccb52d";
-          sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2";
+          rev = "9f38303df3b7";
+          sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -31986,12 +32035,12 @@
     x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x86-lookup";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "x86-lookup";
-          rev = "7a2f43908985590ab8b904004cd4c41e341216be";
-          sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc";
+          rev = "208810ea93214491e6e2329cdbf81de85437939a";
+          sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
@@ -32280,12 +32329,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.10.0";
+        version = "0.11.0";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11";
-          sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148";
+          rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
+          sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -32301,12 +32350,12 @@
     yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yatemplate";
-        version = "1.0";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6";
-          sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
+          rev = "90c14d2e2b8247eeba464a52560af484f8542558";
+          sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 822f9e5f1bd..642b3ebdb5f 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161024";
+        version = "20161031";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20161024.tar";
-          sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h";
+          url = "http://orgmode.org/elpa/org-20161031.tar";
+          sha256 = "1nabn8kj50bxvm3b429j73xipq557kx5j4nr7s5bwxs85i89133q";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20161024";
+        version = "20161031";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar";
-          sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20161031.tar";
+          sha256 = "1j0mwqmdyslvdfhd3x9c9li8s41wsaxk81qzfizdwxl9csdf9ki4";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 96ed8532eae..1ce86e96c4d 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -204,12 +204,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2016.2.4";
+    version = "2016.2.5";
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w";
+      sha256 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p";
     };
     wmClass = "jetbrains-rubymine";
   };
@@ -264,12 +264,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2016.2.1";
+    version = "2016.2.2";
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "0vgr0ds6z0y8qw2v55nr3pi5zb5x0n6pxm13hcp44iradns5kmbp";
+      sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz";
     };
     wmClass = "jetbrains-phpstorm";
   };
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 845a02bebf6..cf1d70350ba 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
-, qtquickcontrols, qtwebkit
+, qtquickcontrols, qtwebkit, qttools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
-, threadweaver, kxmlgui, kwindowsystem
+, threadweaver, kxmlgui, kwindowsystem, grantlee
 , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
-, libksysguard, llvmPackages
+, libksysguard, llvmPackages, makeWrapper
 }:
 
 let
   pname = "kdevelop";
-  version = "5.0";
-  dirVersion = "5.0.0";
+  version = "5.0.2";
+  dirVersion = "5.0.2";
 
 in
 stdenv.mkDerivation rec {
@@ -18,22 +18,25 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c";
+    sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666";
   };
 
-  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
+  ];
 
   buildInputs = [
     qtquickcontrols qtwebkit
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
-    threadweaver kxmlgui kwindowsystem plasma-framework krunner
+    threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
     kdevplatform kdevelop-pg-qt shared_mime_info libksysguard
     llvmPackages.llvm llvmPackages.clang-unwrapped
   ];
 
   postInstall = ''
     wrapQtProgram "$out/bin/kdevelop"
+    wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index 52af0a4e05d..d8a7e7f2b9e 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -6,8 +6,8 @@
 
 let
   pname = "kdevplatform";
-  version = "5.0";
-  dirVersion = "5.0.0";
+  version = "5.0.2";
+  dirVersion = "5.0.2";
 
 in
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10";
+    sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec";
   };
 
   nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
index c16dce1eccc..7a02c3d3f8c 100644
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -24,12 +24,12 @@ let
   unwrapped =
     kdeDerivation rec {
       name = "kile-${version}";
-      version = "2016-07-25";
+      version = "2016-10-24";
 
       src = fetchgit {
         url = git://anongit.kde.org/kile.git;
-        rev = "9cad4757df2493a6099b89114340493c6b436d0b";
-        sha256 = "0kikrkssfd7bj580iwsipirbz2klxvk0f7nfg5y9mkv0pnchx2mj";
+        rev = "e005e2ac140881aa7610bd363d181cf306f91f80";
+        sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4";
 
       };
 
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 69f03f39271..89ae2e04eac 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.11.0";
+  version = "2.11.2";
   name = "${pname}-${version}";
   altname="Texstudio";
 
   src = fetchurl {
     url = "mirror://sourceforge/texstudio/${name}.tar.gz";
-    sha256 = "170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307";
+    sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82";
   };
 
   buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ];
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 2e573e09b31..91f8e677adb 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -26,6 +26,18 @@ stdenv.mkDerivation {
       url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch";
       sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
     })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch";
+      sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch";
+      sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
+      sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
+    })
   ];
 
   configureFlags = [
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 16a05607da3..e9a0dccd30a 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "imv-${version}";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchgit {
     url = "https://github.com/eXeC64/imv.git";
-    rev = "3e6402456b00e29f659baf26ced10f3d7205cf63";
-    sha256 = "0fhc944g7b61jrkd4wn1piq6dkpabsbxpm80pifx9dqmj16sf0pf";
+    rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7";
+    sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7";
   };
 
   buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ];
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 734364b9ccd..e07fa1df546 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.78";
+  name = "blender-2.78a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp";
+    sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1";
   };
 
   buildInputs =
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
new file mode 100644
index 00000000000..6ccae9d5360
--- /dev/null
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name    = "exercism-${version}";
+  version = "2.3.0";
+
+  goPackagePath = "github.com/exercism/cli";
+
+  src = fetchFromGitHub {
+    owner  = "exercism";
+    repo   = "cli";
+    rev    = "v${version}";
+    sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5";
+  };
+
+  meta = with stdenv.lib; {
+   description = "A Go based command line tool for exercism.io";
+   homepage    = http://exercism.io/cli;
+   license     = licenses.mit;
+   maintainers = [ maintainers.rbasso ];
+   platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 4050f8bf589..b604905320b 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -7,7 +7,7 @@
 , gnupg1compat
 , icoutils
 , imagemagick
-, netcat
+, netcat-gnu
 , p7zip
 , python2Packages
 , unzip
@@ -34,7 +34,7 @@ let
       gnupg1compat
       icoutils
       imagemagick
-      netcat
+      netcat-gnu
       p7zip
       unzip
       wget
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 29d7067e235..aa1c1deebd6 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "styx-${version}";
-  version = "0.2.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner  = "styx-static";
     repo   = "styx";
     rev    = "v${version}";
-    sha256 = "1bcd0ss628mhchrl85fy6acxcxqvm1d3qywfaxhikahl1r7inpwg";
+    sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni";
   };
 
   server = caddy.bin;
@@ -19,13 +19,14 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir $out
-    install -D -m 777 $sourceRoot/styx.sh $out/bin/styx
+    install -D -m 777 styx.sh $out/bin/styx
 
     mkdir -p $out/share/styx
-    cp -r $sourceRoot/sample $out/share/styx
+    cp -r lib $out/share/styx
+    cp -r scaffold $out/share/styx
 
     mkdir -p $out/share/doc/styx
-    asciidoctor $sourceRoot/doc/manual.doc -o $out/share/doc/styx/index.html
+    asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html
 
     substituteAllInPlace $out/bin/styx
     substituteAllInPlace $out/share/doc/styx/index.html
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 3a62270afcf..af1256d3442 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -72,7 +72,6 @@ in buildPythonApplication rec {
   '';
 
   postFixup = ''
-    wrapPythonPrograms
     mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
     makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
 
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index bbceca88ae8..c7f2bc83c4d 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.7.7";
+  version = "0.7.8";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "0wza5ladh406lf8hd4fbh4ri82qbcf91lif82357ldy78ghsi5g7";
+    sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9639fe9e74a..d10e787b6ff 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "12.4.22";
+  version = "13.4.21";
   sha256 =
     {
-      "x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y";
-      "i686-linux"   = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr";
+      "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4";
+      "i686-linux"   = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
index 995eddd9321..c6876405462 100644
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ b/pkgs/applications/networking/irc/konversation/1.6.nix
@@ -30,13 +30,13 @@
 let
   unwrapped = let
     pname = "konversation";
-    version = "1.6.1";
+    version = "1.6.2";
   in kdeDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
       url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "28346d6629261a5328c43ffa09c12e37743b3ef4f4bc4c411d39bc19f7bf06c6";
+      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
     };
 
     buildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index c1c7947cd0a..e3cbd17e267 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.neomutt.org;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ hiberno cstrahan vrthra ];
+    maintainers = with maintainers; [ cstrahan vrthra ];
   };
 }
diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
index 302e5ee10e1..7b0be65c8af 100644
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ b/pkgs/applications/networking/syncthing/inotify-deps.nix
@@ -4,17 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cenkalti/backoff";
-      rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6";
-      sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh";
-    };
-  }
-  {
-    goPackagePath = "github.com/gobwas/glob";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gobwas/glob";
-      rev = "ce6abff51712df5da11095fb41dd4b0353559797";
-      sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m";
+      rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
+      sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
     };
   }
   {
@@ -22,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/syncthing/syncthing";
-      rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8";
-      sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9";
+      rev = "7fba8cf759a3b48cfc1507a8c32355865500a571";
+      sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5";
     };
   }
   {
@@ -31,8 +22,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/zillode/notify";
-      rev = "2da5cc9881e8f16bab76b63129c7781898f97d16";
-      sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40";
+      rev = "df33c1a773b462f936a149c36696c018c047eaa9";
+      sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s";
     };
   }
 ]
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index f1343d4a67e..8d9a813f961 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "syncthing-inotify-${version}";
-  version = "0.8.3";
+  version = "0.8.4";
 
   goPackagePath = "github.com/syncthing/syncthing-inotify";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "syncthing";
     repo = "syncthing-inotify";
     rev = "v${version}";
-    sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw";
+    sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw";
   };
 
   goDeps = ./inotify-deps.nix;
@@ -25,6 +25,8 @@ buildGoPackage rec {
     substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
                $bin/etc/systemd/user/syncthing-inotify.service \
                --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
index f9be34efd95..6751e7d6d11 100644
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe";
+    sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 3cb7ed491fb..0e9f2eba1d1 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -77,6 +77,6 @@ stdenv.mkDerivation {
     description = "Collect, organize, cite, and share your research sources";
     license = licenses.agpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel ];
+    broken = true; # probably; see #20049
   };
 }
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
index eb74891f511..aae2101f50e 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -2,11 +2,22 @@
 # - The csdp program used for the Micromega tactic is statically referenced.
 #   However, coq can build without csdp by setting it to null.
 #   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
+# - The patch-level version can be specified through the `pl` argument to
+#   the derivation; it defaults to the greatest.
 
-{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
+{ stdenv, fetchurl, writeText, pkgconfig
+, ocaml, findlib, camlp5, ncurses
+, lablgtk ? null, csdp ? null
+, pl ? "3"
+}:
 
 let
-  version = "8.5pl2";
+  version = "8.5pl${pl}";
+  sha256 = {
+   "1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
+   "2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
+   "3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
+  }."${pl}";
   coq-version = "8.5";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -24,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
+    inherit sha256;
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
@@ -34,7 +45,7 @@ stdenv.mkDerivation {
     RM=$(type -tp rm)
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    substituteInPlace configure.ml --replace "if arch = \"Darwin\" || arch = \"FreeBSD\" then \"md5" "if arch = \"Darwinx\" then \"md5"
+    substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
     ${csdpPatch}
   '';
 
@@ -57,7 +68,11 @@ stdenv.mkDerivation {
 
   prefixKey = "-prefix ";
 
-  buildFlags = "revision coq coqide";
+  buildFlags = "revision coq coqide bin/votour";
+
+  postInstall = ''
+    cp bin/votour $out/bin/
+  '';
 
   meta = with stdenv.lib; {
     description = "Coq proof assistant";
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index eb3054dfd5b..f9d95e121f5 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
-gem 'github-markup', '~> 1.4'
+gem 'gitlab-markup', '~> 1.5.0'
 gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.3.2'
 gem 'rdoc',          '~>3.6'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 69f2af4f6f0..0dd9b47ff3e 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -281,6 +281,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
+    gitlab-markup (1.5.0)
     gitlab_git (10.6.6)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
@@ -868,8 +869,8 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   gemojione (~> 3.0)
   github-linguist (~> 4.7.0)
-  github-markup (~> 1.4)
   gitlab-flowdock-git-hook (~> 1.0.1)
+  github-markup (~> 1.5.0)
   gitlab_git (~> 10.6.6)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 7d6a85a81aa..92b5b552ec6 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -24,7 +24,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.12.6";
+  version = "8.12.8";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh";
+    sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index bf552b5d4ef..a87d4f92c62 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -937,6 +937,7 @@
       type = "gem";
     };
     version = "1.4.0";
+    meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown
   };
   gitlab-flowdock-git-hook = {
     dependencies = ["flowdock" "gitlab-grit" "multi_json"];
@@ -955,6 +956,14 @@
     };
     version = "2.8.1";
   };
+  gitlab-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
   gitlab_git = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2821,4 +2830,4 @@
     };
     version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b41eae41a5c..3ed58017fe2 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -31,6 +31,7 @@
 , libpngSupport      ? true,  libpng        ? null
 , youtubeSupport     ? true,  youtube-dl    ? null
 , vaapiSupport       ? true,  libva         ? null
+, drmSupport         ? true,  libdrm        ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
 , jackaudioSupport   ? false, libjack2      ? null
 
@@ -65,6 +66,7 @@ assert youtubeSupport     -> available youtube-dl;
 assert vapoursynthSupport -> available vapoursynth;
 assert jackaudioSupport   -> available libjack2;
 assert vaapiSupport       -> available libva;
+assert drmSupport         -> available libdrm;
 
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
@@ -133,6 +135,7 @@ in stdenv.mkDerivation rec {
     ++ optional sdl2Support        SDL2
     ++ optional cacaSupport        libcaca
     ++ optional vaapiSupport       libva
+    ++ optional drmSupport         libdrm
     ++ optional vapoursynthSupport vapoursynth
     ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
     ++ optionals x11Support        [ libX11 libXext mesa libXxf86vm ]
diff --git a/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch
new file mode 100644
index 00000000000..05a95599937
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
+index d938427..7557a7d 100644
+--- a/hw/9pfs/9p.c
++++ b/hw/9pfs/9p.c
+@@ -3261,6 +3261,7 @@
+     xattr_fidp->fs.xattr.flags = flags;
+     v9fs_string_init(&xattr_fidp->fs.xattr.name);
+     v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
++    g_free(xattr_fidp->fs.xattr.value);
+     xattr_fidp->fs.xattr.value = g_malloc0(size);
+     err = offset;
+     put_fid(pdu, file_fidp);
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f1ee4426d97..f81781987cc 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -47,6 +47,77 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-etc-install.patch
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch";
+      sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch";
+      sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch";
+      sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch";
+      sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch";
+      sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch";
+      sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch";
+      sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch";
+      sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch";
+      sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-8909.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050";
+      sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-8910.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225";
+      sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9103.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d";
+      sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9104.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6";
+      sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9105.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c";
+      sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9106.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9";
+      sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z";
+    })
+
+    # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html
+
+    # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
+    ./CVE-2016-9102.patch
   ];
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index 132c10ae973..a1334112cf9 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A lightweight xcb based bar with XFT-support";
     homepage = https://github.com/krypt-n/bar;
-    maintainers = [ stdenv.lib.maintainers.hiberno ];
     license = "Custom";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 2ce69a68f32..ac577385ad4 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     description = "A tiling window manager for X11";
     homepage    = https://github.com/stumpwm/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hiberno the-kenny ];
+    maintainers = with maintainers; [ the-kenny ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix
index c199cf6c01b..34d42425253 100644
--- a/pkgs/applications/window-managers/yabar/default.nix
+++ b/pkgs/applications/window-managers/yabar/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A modern and lightweight status bar for X window managers";
     homepage    = "https://github.com/geommer/yabar";
-    maintainers = [ maintainers.hiberno ];
     license     = licenses.mit;
     platforms   = platforms.linux;
   };
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 5f0a23853e4..21e0d2b5128 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -395,10 +395,14 @@ rec {
 
       layer =
         if runAsRoot == null
-        then mkPureLayer { inherit name baseJson contents extraCommands; }
-        else mkRootLayer { inherit name baseJson fromImage fromImageName
-                                   fromImageTag contents runAsRoot diskSize
-                                   extraCommands; };
+        then mkPureLayer {
+          name = baseName;
+          inherit baseJson contents extraCommands;
+        } else mkRootLayer {
+          name = baseName;
+          inherit baseJson fromImage fromImageName fromImageTag
+                  contents runAsRoot diskSize extraCommands;
+        };
       result = runCommand "docker-image-${baseName}.tar.gz" {
         buildInputs = [ jshon pigz coreutils findutils ];
         imageName = name;
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 1bdda969653..b729144b860 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -8,7 +8,7 @@ mkdir $out/nix-support
 cflagsCompile="-B$out/bin/"
 
 if test -z "$nativeLibc" -a -n "$libc"; then
-    cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc/include"
+    cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc_dev/include"
     ldflags="$ldflags -L$libc/lib"
     # Get the proper dynamic linker for glibc and uclibc. 
     dlinker=`eval 'echo $libc/lib/ld*.so.?'`
diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
index ebea819b191..3b06d8f4749 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
-, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu
+, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu
 , samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep
 }:
 
@@ -10,7 +10,7 @@ with stdenv.lib;
 let
   controller = import ./controller {
     inherit stdenv writeScript vmTools makeInitrd;
-    inherit samba vde2 openssh socat netcat coreutils gzip gnugrep;
+    inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep;
   };
 
   mkCygwinImage = import ./cygwin-iso {
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 06a0a229306..9009702113e 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -1,5 +1,5 @@
 { stdenv, writeScript, vmTools, makeInitrd
-, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip
+, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip
 }:
 
 { sshKey
@@ -79,7 +79,7 @@ let
     ${coreutils}/bin/chmod 600 /ssh.key
   '' + (if installMode then ''
     echo -n "Waiting for Windows installation to finish..."
-    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+    while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
       echo -n .
       # Print a dot every 10 seconds only to shorten line length.
       ${coreutils}/bin/sleep 10
@@ -118,7 +118,7 @@ let
     ${samba}/sbin/smbd -D
 
     echo -n "Waiting for Windows VM to become available..."
-    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+    while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
       echo -n .
       ${coreutils}/bin/sleep 1
     done
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index f9f1d75c70d..c668e7569a4 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -3,7 +3,7 @@ pkgs:
 let
   bootstrapper = import ./bootstrap.nix {
     inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd;
-    inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba;
+    inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba;
     inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph;
     inherit (pkgs) gnugrep;
   };
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix
index fe429fe1df8..d93c0fb96d4 100644
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/pkgs/data/fonts/mononoki/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/madmalik/mononoki;
     description = "A font for programming and code review";
     license = licenses.ofl;
-    maintainers = [ maintainers.hiberno ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
new file mode 100644
index 00000000000..812362d6b30
--- /dev/null
+++ b/pkgs/data/misc/hackage/default.nix
@@ -0,0 +1,11 @@
+{ fetchFromGitHub }:
+
+# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"
+# instead if you want the latest Hackage automatically at the price of frequent re-downloads.
+
+fetchFromGitHub {
+  owner = "commercialhaskell";
+  repo = "all-cabal-hashes";
+  rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec";
+  sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm";
+}
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index a5ddcf35677..0809f2d6693 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix
index b0e94c6a595..dcde867dffa 100644
--- a/pkgs/desktops/kde-5/plasma/ksysguard.nix
+++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix
@@ -1,6 +1,6 @@
 { plasmaPackage, ecm, kdoctools, kconfig
 , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
-, kiconthemes, libksysguard
+, kiconthemes, libksysguard, qtwebkit
 }:
 
 plasmaPackage {
@@ -8,6 +8,6 @@ plasmaPackage {
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    kdelibs4support ki18n
+    kdelibs4support ki18n qtwebkit
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 5fc836f10a8..08daf740183 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz";
-      sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd";
-      name = "bluedevil-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz";
+      sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6";
+      name = "bluedevil-5.8.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz";
-      sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8";
-      name = "breeze-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz";
+      sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp";
+      name = "breeze-5.8.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz";
-      sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1";
-      name = "breeze-grub-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz";
+      sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k";
+      name = "breeze-grub-5.8.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz";
-      sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k";
-      name = "breeze-gtk-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz";
+      sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g";
+      name = "breeze-gtk-5.8.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz";
-      sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r";
-      name = "breeze-plymouth-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz";
+      sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3";
+      name = "breeze-plymouth-5.8.3.tar.xz";
     };
   };
   discover = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz";
-      sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04";
-      name = "discover-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz";
+      sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh";
+      name = "discover-5.8.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz";
-      sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc";
-      name = "kactivitymanagerd-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz";
+      sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj";
+      name = "kactivitymanagerd-5.8.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz";
-      sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca";
-      name = "kde-cli-tools-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz";
+      sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b";
+      name = "kde-cli-tools-5.8.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz";
-      sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766";
-      name = "kdecoration-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz";
+      sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca";
+      name = "kdecoration-5.8.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz";
-      sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7";
-      name = "kde-gtk-config-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz";
+      sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d";
+      name = "kde-gtk-config-5.8.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz";
-      sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq";
-      name = "kdeplasma-addons-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz";
+      sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3";
+      name = "kdeplasma-addons-5.8.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz";
-      sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn";
-      name = "kgamma5-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz";
+      sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065";
+      name = "kgamma5-5.8.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz";
-      sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5";
-      name = "khotkeys-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz";
+      sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9";
+      name = "khotkeys-5.8.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz";
-      sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865";
-      name = "kinfocenter-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz";
+      sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv";
+      name = "kinfocenter-5.8.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz";
-      sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21";
-      name = "kmenuedit-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz";
+      sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7";
+      name = "kmenuedit-5.8.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz";
-      sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr";
-      name = "kscreen-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz";
+      sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny";
+      name = "kscreen-5.8.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz";
-      sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1";
-      name = "kscreenlocker-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz";
+      sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv";
+      name = "kscreenlocker-5.8.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz";
-      sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s";
-      name = "ksshaskpass-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz";
+      sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj";
+      name = "ksshaskpass-5.8.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz";
-      sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn";
-      name = "ksysguard-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz";
+      sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd";
+      name = "ksysguard-5.8.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz";
-      sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb";
-      name = "kwallet-pam-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz";
+      sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd";
+      name = "kwallet-pam-5.8.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz";
-      sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa";
-      name = "kwayland-integration-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz";
+      sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4";
+      name = "kwayland-integration-5.8.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz";
-      sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y";
-      name = "kwin-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz";
+      sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w";
+      name = "kwin-5.8.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz";
-      sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23";
-      name = "kwrited-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz";
+      sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9";
+      name = "kwrited-5.8.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz";
-      sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c";
-      name = "libkscreen-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz";
+      sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7";
+      name = "libkscreen-5.8.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz";
-      sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l";
-      name = "libksysguard-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz";
+      sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy";
+      name = "libksysguard-5.8.3.tar.xz";
     };
   };
   milou = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz";
-      sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9";
-      name = "milou-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz";
+      sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl";
+      name = "milou-5.8.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz";
-      sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar";
-      name = "oxygen-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz";
+      sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg";
+      name = "oxygen-5.8.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz";
-      sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj";
-      name = "plasma-desktop-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz";
+      sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7";
+      name = "plasma-desktop-5.8.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz";
-      sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf";
-      name = "plasma-integration-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz";
+      sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23";
+      name = "plasma-integration-5.8.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz";
-      sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22";
-      name = "plasma-nm-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz";
+      sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7";
+      name = "plasma-nm-5.8.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz";
-      sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi";
-      name = "plasma-pa-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz";
+      sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4";
+      name = "plasma-pa-5.8.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz";
-      sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y";
-      name = "plasma-sdk-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz";
+      sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7";
+      name = "plasma-sdk-5.8.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz";
-      sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5";
-      name = "plasma-tests-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz";
+      sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4";
+      name = "plasma-tests-5.8.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz";
-      sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44";
-      name = "plasma-workspace-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz";
+      sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb";
+      name = "plasma-workspace-5.8.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz";
-      sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi";
-      name = "plasma-workspace-wallpapers-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz";
+      sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2";
+      name = "plasma-workspace-wallpapers-5.8.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.2";
+    version = "1-5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz";
-      sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f";
-      name = "polkit-kde-agent-1-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz";
+      sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z";
+      name = "polkit-kde-agent-1-5.8.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz";
-      sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x";
-      name = "powerdevil-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz";
+      sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1";
+      name = "powerdevil-5.8.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz";
-      sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3";
-      name = "sddm-kcm-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz";
+      sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d";
+      name = "sddm-kcm-5.8.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz";
-      sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi";
-      name = "systemsettings-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz";
+      sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm";
+      name = "systemsettings-5.8.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.2";
+    version = "5.8.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz";
-      sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91";
-      name = "user-manager-5.8.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz";
+      sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v";
+      name = "user-manager-5.8.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 770f3449023..3314d313ad2 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
-  libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat
+  libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu
 }:
 
 stdenv.mkDerivation rec {
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
     libnotify
     lm_sensors
     hddtemp
-    netcat
+    netcat-gnu
    ];
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
-    "--with-pathnetcat=${netcat}/bin/netcat"
+    "--with-pathnetcat=${netcat-gnu}/bin/netcat"
   ];
 
   meta = {
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index fb95372a96f..f5554ee0ce3 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configurePhase = ''
+    substituteInPlace ./configure --replace pl2 pl3
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 7037bf3808f..f74815a3b95 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -116,5 +116,11 @@ in {
     sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
   };
 
+  cudatoolkit8 = common {
+    version = "8.0.44";
+    url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run;
+    sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34";
+  };
+
 }
 
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
new file mode 100644
index 00000000000..2bf13cb895f
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -0,0 +1,178 @@
+{ mkDerivation
+, test-framework
+, test-framework-hunit
+, test-framework-quickcheck2
+, data-default
+, ghc-paths
+, haskell-src-exts
+, haskell-src-meta
+, optparse-applicative
+, system-fileio
+, system-filepath
+, text-binary
+, unordered-containers
+, cabal-install
+, wl-pprint-text
+, base16-bytestring
+, executable-path
+, transformers-compat
+, haddock-api
+, regex-posix
+, callPackage
+
+, bootPkgs, gmp
+, jailbreak-cabal
+
+, runCommand
+, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
+, time
+, zlib, aeson, attoparsec, bzlib, hashable
+, lens
+, parallel, safe, shelly, split, stringsearch, syb
+, tar, terminfo
+, vector, yaml, fetchgit, fetchFromGitHub, Cabal
+, alex, happy, git, gnumake, autoconf, patch
+, automake, libtool
+, cryptohash
+, haddock, hspec, xhtml, primitive, cacert, pkgs
+, coreutils
+, libiconv
+
+, ghcjsBootSrc ? fetchgit {
+    url = git://github.com/ghcjs/ghcjs-boot.git;
+    rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
+    sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
+    fetchSubmodules = true;
+  }
+, ghcjsBoot ? import ./ghcjs-boot.nix {
+    inherit runCommand;
+    src = ghcjsBootSrc;
+  }
+, shims ? import ./head_shims.nix { inherit fetchFromGitHub; }
+}:
+let
+  inherit (bootPkgs) ghc;
+  version = "0.2.020161101";
+
+in mkDerivation (rec {
+  pname = "ghcjs";
+  inherit version;
+  src = fetchFromGitHub {
+    owner = "ghcjs";
+    repo = "ghcjs";
+    rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
+    sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  jailbreak = true;
+  doHaddock = false;
+  doCheck = false;
+  buildDepends = [
+    filepath HTTP mtl network random stm time zlib aeson attoparsec
+    bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
+    lens optparse-applicative parallel safe shelly split
+    stringsearch syb system-fileio system-filepath tar terminfo text-binary
+    unordered-containers vector wl-pprint-text yaml
+    alex happy git gnumake autoconf automake libtool patch gmp
+    base16-bytestring cryptohash executable-path haddock-api
+    transformers-compat QuickCheck haddock hspec xhtml
+    regex-posix libiconv
+  ];
+  buildTools = [ nodejs git ];
+  testDepends = [
+    HUnit test-framework test-framework-hunit
+  ];
+  patches = [ ./ghcjs.patch ];
+  postPatch = ''
+    substituteInPlace Setup.hs \
+      --replace "/usr/bin/env" "${coreutils}/bin/env"
+
+    substituteInPlace src/Compiler/Info.hs \
+      --replace "@PREFIX@" "$out"          \
+      --replace "@VERSION@" "${version}"
+
+    substituteInPlace src-bin/Boot.hs \
+      --replace "@PREFIX@" "$out"     \
+      --replace "@CC@"     "${stdenv.cc}/bin/cc"
+  '';
+  preBuild = ''
+    export HOME="$TMP"
+
+    local topDir=$out/lib/ghcjs-${version}
+    mkdir -p $topDir
+
+    cp -r ${ghcjsBoot} $topDir/ghcjs-boot
+    chmod -R u+w $topDir/ghcjs-boot
+
+    cp -r ${shims} $topDir/shims
+    chmod -R u+w $topDir/shims
+
+    # Make the patches be relative their corresponding package's directory.
+    # See: https://github.com/ghcjs/ghcjs-boot/pull/12
+    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
+      echo "fixing patch: $patch"
+      sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
+    done
+  '';
+  # We build with --quick so we can build stage 2 packages separately.
+  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
+  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
+  postInstall = ''
+    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
+      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
+        --dev \
+        --quick \
+        --with-cabal ${cabal-install}/bin/cabal \
+        --with-gmp-includes ${gmp.dev}/include \
+        --with-gmp-libraries ${gmp.out}/lib
+  '';
+  passthru = let
+    ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
+      generated = ./node-packages-generated.nix;
+      self = ghcjsNodePkgs;
+    };
+  in {
+    inherit bootPkgs;
+    isCross = true;
+    isGhcjs = true;
+    inherit nodejs ghcjsBoot;
+    inherit (ghcjsNodePkgs) "socket.io";
+
+    # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
+    # It can be generated with the command:
+    # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/      \"\1\"/'"
+    stage1Packages = [
+      "array"
+      "base"
+      "binary"
+      "rts"
+      "bytestring"
+      "containers"
+      "deepseq"
+      "directory"
+      "filepath"
+      "ghc-prim"
+      "ghcjs-prim"
+      "integer-gmp"
+      "old-locale"
+      "pretty"
+      "primitive"
+      "process"
+      "template-haskell"
+      "time"
+      "transformers"
+      "unix"
+    ];
+
+    mkStage2 = import ./stage2.nix {
+      inherit ghcjsBoot;
+    };
+  };
+
+  homepage = "https://github.com/ghcjs/ghcjs";
+  description = "A Haskell to JavaScript compiler that uses the GHC API";
+  license = stdenv.lib.licenses.bsd3;
+  platforms = ghc.meta.platforms;
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+})
diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix
new file mode 100644
index 00000000000..e321978f0bd
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/head_shims.nix
@@ -0,0 +1,7 @@
+{ fetchFromGitHub }:
+fetchFromGitHub {
+  owner = "ghcjs";
+  repo = "shims";
+  rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37";
+  sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws";
+}
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index a1b131eac81..decbf678c34 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9";
+    sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 40d7ef06432..928de23f04b 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.4";
   name = "solc-${version}";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "solidity";
     rev = "v${version}";
-    sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4";
+    sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z";
   };
 
   patchPhase = ''
-    echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3
+    echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61
   '';
 
   buildInputs = [ boost cmake jsoncpp ];
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
new file mode 100644
index 00000000000..a92c14bdbff
--- /dev/null
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchgit, coq, python27}:
+
+stdenv.mkDerivation rec {
+
+  name = "coq-fiat-${coq.coq-version}-${version}";
+  version = "20161024";
+
+  src = fetchgit {
+    url = "https://github.com/mit-plv/fiat.git";
+    rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
+    sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 python27 ];
+  propagatedBuildInputs = [ coq ];
+
+  doCheck = false;
+
+  enableParallelBuilding = false;
+  buildPhase = "make -j$NIX_BUILD_CORES";
+
+  installPhase = ''
+    COQLIB=$out/lib/coq/${coq.coq-version}/
+    mkdir -p $COQLIB/user-contrib/Fiat
+    cp -pR src/* $COQLIB/user-contrib/Fiat
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://plv.csail.mit.edu/fiat/;
+    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;
+  };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50bb3695a71..6849fa03908 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -43,7 +43,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc";
+      sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01";
       rev = drv.version;
     };
   })).overrideScope (self: super: {
@@ -142,13 +142,13 @@ self: super: {
   HDBC-odbc = dontHaddock super.HDBC-odbc;
   hoodle-core = dontHaddock super.hoodle-core;
   hsc3-db = dontHaddock super.hsc3-db;
-  hspec-discover = dontHaddock super.hspec-discover;
   http-client-conduit = dontHaddock super.http-client-conduit;
   http-client-multipart = dontHaddock super.http-client-multipart;
   markdown-unlit = dontHaddock super.markdown-unlit;
   network-conduit = dontHaddock super.network-conduit;
   shakespeare-js = dontHaddock super.shakespeare-js;
   shakespeare-text = dontHaddock super.shakespeare-text;
+  swagger = dontHaddock super.swagger;  # http://hydra.cryp.to/build/2035868/nixlog/1/raw
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
 
@@ -298,7 +298,6 @@ self: super: {
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
-  hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   mongoDB = dontCheck super.mongoDB;
   network-transport-tcp = dontCheck super.network-transport-tcp;
@@ -801,7 +800,7 @@ self: super: {
       ln -s $lispdir $out/share/emacs/site-lisp
     '';
   })).override {
-    haskell-src-exts = self.haskell-src-exts_1_18_2;
+    haskell-src-exts = self.haskell-src-exts_1_19_0;
   };
 
   # # Make elisp files available at a location where people expect it.
@@ -983,6 +982,9 @@ self: super: {
     criterion = super.criterion.override { inherit (super) optparse-applicative; };
   });
 
+  # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
+  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
+
   # Test suite fails a QuickCheck property.
   optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
 
@@ -1015,15 +1017,26 @@ self: super: {
     doCheck = false;
   });
 
+  # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
+  # is hard because of transitive dependencies, so we just disable tests.
+  http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2;
+
+  # Fix build for latest versions of servant and servant-client.
+  servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
+    http-api-data = self.http-api-data_0_3_2;
+  });
+  servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
+    http-api-data = self.http-api-data_0_3_2;
+    servant-server = self.servant-server_0_9_1_1;
+    servant = self.servant_0_9_1_1;
+  });
+
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
   # https://github.com/fpco/store/issues/77
   store = dontCheck super.store;
-
-  store_0_3 = super.store_0_3.overrideScope (self: super: {
-    store-core = self.store-core_0_3;
-  });
+  store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; });
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
@@ -1041,4 +1054,17 @@ self: super: {
     http-conduit = self.http-conduit_2_2_3;
   });
 
+  # https://hydra.nixos.org/build/42769611/nixlog/1/raw
+  # note: the library is unmaintained, no upstream issue
+  dataenc = doJailbreak super.dataenc;
+
+  libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
+    # https://github.com/ocharles/libsystemd-journal/pull/17
+    jailbreak = true;
+    librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
+  });
+
+  # horribly outdated (X11 interface changed a lot)
+  sindre = markBroken super.sindre;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 5c7348678b7..b01620e7a9a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -60,4 +60,7 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
+  # https://github.com/christian-marie/xxhash/issues/3
+  xxhash = doJailbreak super.xxhash;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2e89521fca8..e135987a4cf 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -32,7 +32,7 @@ core-packages:
   - xhtml-3000.2.1
 
 default-package-overrides:
-  # LTS Haskell 7.5
+  # LTS Haskell 7.7
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -146,7 +146,7 @@ default-package-overrides:
   - array-memoize ==0.6.0
   - arrow-list ==0.7
   - ascii-progress ==0.3.3.0
-  - asciidiagram ==1.3.1.2
+  - asciidiagram ==1.3.2
   - asn1-encoding ==0.9.4
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
@@ -264,7 +264,7 @@ default-package-overrides:
   - cabal-src ==0.3.0.2
   - cache ==0.1.0.0
   - cacophony ==0.8.0
-  - cairo ==0.13.3.0
+  - cairo ==0.13.3.1
   - call-stack ==0.1.0
   - camfort ==0.900
   - carray ==0.1.6.5
@@ -284,9 +284,9 @@ default-package-overrides:
   - ChannelT ==0.0.0.2
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.1
-  - Chart ==1.8
-  - Chart-cairo ==1.8
-  - Chart-diagrams ==1.8
+  - Chart ==1.8.1
+  - Chart-cairo ==1.8.1
+  - Chart-diagrams ==1.8.1
   - ChasingBottoms ==1.3.1.2
   - cheapskate ==0.1.0.5
   - cheapskate-highlight ==0.1.0.0
@@ -421,7 +421,7 @@ default-package-overrides:
   - dbus ==0.10.12
   - debian-build ==0.10.1.0
   - Decimal ==0.4.2
-  - declarative ==0.2.2
+  - declarative ==0.2.3
   - deepseq-generics ==0.2.0.0
   - dejafu ==0.4.0.0
   - dependent-map ==0.2.3.0
@@ -631,7 +631,7 @@ default-package-overrides:
   - gi-pango ==1.0.3
   - gi-soup ==2.4.3
   - gi-webkit ==3.0.3
-  - gio ==0.13.3.0
+  - gio ==0.13.3.1
   - gipeda ==0.3.2.2
   - giphy-api ==0.4.0.0
   - git-fmt ==0.4.1.0
@@ -645,7 +645,7 @@ default-package-overrides:
   - gl ==0.7.8.1
   - glabrous ==0.1.2.0
   - GLFW-b ==1.4.8.1
-  - glib ==0.13.4.0
+  - glib ==0.13.4.1
   - Glob ==0.7.12
   - gloss ==1.10.2.3
   - gloss-rendering ==1.10.3.3
@@ -762,10 +762,10 @@ default-package-overrides:
   - grouped-list ==0.2.1.2
   - groupoids ==4.0
   - groups ==0.4.0.0
-  - gtk ==0.14.5
+  - gtk ==0.14.6
   - gtk2hs-buildtools ==0.13.2.1
-  - gtk3 ==0.14.5
-  - gtksourceview3 ==0.13.3.0
+  - gtk3 ==0.14.6
+  - gtksourceview3 ==0.13.3.1
   - H ==0.9.0.1
   - hackage-db ==1.22
   - hackage-mirror ==0.1.1.1
@@ -811,7 +811,7 @@ default-package-overrides:
   - haskoin-core ==0.4.0
   - hasql ==0.19.15.2
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.1.3
+  - hasty-hamiltonian ==1.1.4
   - HaTeX ==3.17.0.2
   - hatex-guide ==1.3.1.5
   - hbayes ==0.5.2
@@ -846,9 +846,9 @@ default-package-overrides:
   - hjsmin ==0.2.0.2
   - hjsonpointer ==1.0.0.2
   - hjsonschema ==1.1.0.1
-  - hledger ==0.27.1
-  - hledger-interest ==1.4.4
-  - hledger-lib ==0.27.1
+  - hledger ==1.0.1
+  - hledger-interest ==1.5
+  - hledger-lib ==1.0.1
   - hlibgit2 ==0.18.0.15
   - hlibsass ==0.1.5.0
   - hlint ==1.9.35
@@ -862,7 +862,6 @@ default-package-overrides:
   - hocilib ==0.1.0
   - holy-project ==0.2.0.1
   - homplexity ==0.4.3.3
-  - hoogle ==5.0.1
   - hOpenPGP ==2.5.5
   - hopenpgp-tools ==0.19.4
   - hopenssl ==1.7
@@ -876,7 +875,7 @@ default-package-overrides:
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
-  - hpio ==0.8.0.3
+  - hpio ==0.8.0.4
   - hprotoc ==2.4.0
   - hquantlib ==0.0.3.2
   - hreader ==1.0.2
@@ -901,11 +900,11 @@ default-package-overrides:
   - HsOpenSSL ==0.11.3.2
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.2.3
+  - hspec ==2.2.4
   - hspec-attoparsec ==0.1.0.2
   - hspec-contrib ==0.3.0
-  - hspec-core ==2.2.3
-  - hspec-discover ==2.2.3
+  - hspec-core ==2.2.4
+  - hspec-discover ==2.2.4
   - hspec-expectations ==0.7.2
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
@@ -938,7 +937,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.2
   - http-media ==0.6.4
-  - http-reverse-proxy ==0.4.3.1
+  - http-reverse-proxy ==0.4.3.2
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
   - http2 ==1.6.2
@@ -950,7 +949,7 @@ default-package-overrides:
   - hvect ==0.3.1.0
   - hw-bits ==0.1.0.1
   - hw-conduit ==0.0.0.11
-  - hw-diagnostics ==0.0.0.4
+  - hw-diagnostics ==0.0.0.5
   - hw-parser ==0.0.0.1
   - hw-prim ==0.1.0.3
   - hw-rankselect ==0.3.0.0
@@ -990,7 +989,7 @@ default-package-overrides:
   - inline-r ==0.9.0.0
   - insert-ordered-containers ==0.1.0.1
   - integration ==0.2.1
-  - intero ==0.1.18
+  - intero ==0.1.19
   - interpolate ==0.1.0
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.1.1
@@ -1008,8 +1007,8 @@ default-package-overrides:
   - iproute ==1.7.1
   - IPv6Addr ==0.6.1.0
   - irc ==0.6.1.0
-  - irc-client ==0.4.4.0
-  - irc-conduit ==0.2.1.0
+  - irc-client ==0.4.4.1
+  - irc-conduit ==0.2.1.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.0
   - islink ==0.1.0.0
@@ -1050,7 +1049,7 @@ default-package-overrides:
   - lackey ==0.4.1
   - language-c ==0.5.0
   - language-c-quote ==0.11.7
-  - language-dockerfile ==0.3.4.0
+  - language-dockerfile ==0.3.5.0
   - language-ecmascript ==0.17.1.0
   - language-fortran ==0.5.1
   - language-glsl ==0.2.0
@@ -1121,7 +1120,7 @@ default-package-overrides:
   - matrix ==0.3.5.0
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
-  - mcmc-types ==1.0.1
+  - mcmc-types ==1.0.2
   - megaparsec ==5.0.1
   - memory ==0.13
   - MemoTrie ==0.6.4
@@ -1139,7 +1138,7 @@ default-package-overrides:
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.7.0
   - microlens-th ==0.4.1.0
-  - mighty-metropolis ==1.0.2
+  - mighty-metropolis ==1.0.3
   - mime-mail ==0.4.11
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
@@ -1148,7 +1147,7 @@ default-package-overrides:
   - MissingH ==1.4.0.1
   - mmap ==0.5.9
   - mmorph ==1.0.6
-  - mockery ==0.3.3
+  - mockery ==0.3.4
   - modify-fasta ==0.8.2.1
   - moesocks ==1.0.0.41
   - monad-control ==1.0.1.0
@@ -1200,7 +1199,7 @@ default-package-overrides:
   - MusicBrainz ==0.2.4
   - mustache ==2.1
   - mutable-containers ==0.3.3
-  - mwc-probability ==1.2.1
+  - mwc-probability ==1.2.2
   - mwc-random ==0.13.4.0
   - mwc-random-monad ==0.7.3.1
   - nagios-check ==0.3.2
@@ -1280,15 +1279,15 @@ default-package-overrides:
   - pagination ==0.1.1
   - palette ==0.1.0.4
   - pandoc ==1.17.1
-  - pandoc-citeproc ==0.10.1.2
+  - pandoc-citeproc ==0.10.2.2
   - pandoc-types ==1.16.1.1
-  - pango ==0.13.3.0
+  - pango ==0.13.3.1
   - parallel ==3.2.1.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.7
   - parsec ==3.1.11
   - parsers ==0.12.4
-  - partial-handler ==1.0.1
+  - partial-handler ==1.0.2
   - path ==0.5.9
   - path-extra ==0.0.3
   - path-io ==1.2.0
@@ -1307,7 +1306,7 @@ default-package-overrides:
   - pdfinfo ==1.5.4
   - pem ==0.2.2
   - permutation ==0.5.0.5
-  - persistable-record ==0.4.0.3
+  - persistable-record ==0.4.1.0
   - persistable-types-HDBC-pg ==0.0.1.4
   - persistent ==2.6
   - persistent-postgresql ==2.6
@@ -1378,7 +1377,7 @@ default-package-overrides:
   - primitive ==0.6.1.0
   - process-extras ==0.4.1.4
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.3.0.2
+  - profiteur ==0.3.0.3
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1390,7 +1389,7 @@ default-package-overrides:
   - protobuf-simple ==0.1.0.2
   - protocol-buffers ==2.4.0
   - protocol-buffers-descriptor ==2.4.0
-  - protolude ==0.1.8
+  - protolude ==0.1.10
   - proxied ==0.2
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
@@ -1406,6 +1405,7 @@ default-package-overrides:
   - quantum-random ==0.6.3
   - QuasiText ==0.1.2.6
   - questioner ==0.1.1.0
+  - quickbench ==1.0
   - QuickCheck ==2.8.2
   - quickcheck-arbitrary-adt ==0.2.0.0
   - quickcheck-assertions ==0.2.0
@@ -1470,7 +1470,7 @@ default-package-overrides:
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
   - reroute ==0.4.0.1
-  - resolve-trivial-conflicts ==0.3.2.2
+  - resolve-trivial-conflicts ==0.3.2.3
   - resource-pool ==0.2.3.2
   - resourcet ==1.1.8
   - rest-client ==0.5.1.1
@@ -1554,7 +1554,6 @@ default-package-overrides:
   - shake-language-c ==0.10.0
   - shakespeare ==2.0.11.1
   - shell-conduit ==4.5.2
-  - ShellCheck ==0.4.4
   - shelly ==1.6.8.1
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
@@ -1596,8 +1595,8 @@ default-package-overrides:
   - sourcemap ==0.1.6
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
-  - speedy-slice ==0.1.3
-  - sphinx ==0.6.0.1
+  - speedy-slice ==0.1.4
+  - sphinx ==0.6.0.2
   - Spintax ==0.1.0.1
   - splice ==0.6.1.1
   - split ==0.2.3.1
@@ -1713,7 +1712,7 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.8
   - testing-feat ==0.4.0.3
-  - texmath ==0.8.6.6
+  - texmath ==0.8.6.7
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
@@ -1859,7 +1858,7 @@ default-package-overrides:
   - vinyl ==0.5.2
   - vinyl-utils ==0.3.0.0
   - void ==0.7.1
-  - vty ==5.11.1
+  - vty ==5.11.3
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-conduit ==3.0.0.3
@@ -1896,8 +1895,8 @@ default-package-overrides:
   - web-routes-wai ==0.24.3
   - webdriver ==0.8.4
   - webdriver-angular ==0.1.11
-  - webkitgtk3 ==0.14.2.0
-  - webkitgtk3-javascriptcore ==0.14.2.0
+  - webkitgtk3 ==0.14.2.1
+  - webkitgtk3-javascriptcore ==0.14.2.1
   - webpage ==0.0.4
   - webrtc-vad ==0.1.0.3
   - websockets ==0.9.7.0
@@ -1909,7 +1908,7 @@ default-package-overrides:
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
   - with-location ==0.1.0
-  - withdependencies ==0.2.3
+  - withdependencies ==0.2.4
   - witherable ==0.1.3.3
   - wizards ==1.0.2
   - wl-pprint ==1.2
@@ -1968,7 +1967,7 @@ default-package-overrides:
   - yesod-eventsource ==1.4.0.1
   - yesod-fay ==0.8.0
   - yesod-fb ==0.3.4
-  - yesod-form ==1.4.7.1
+  - yesod-form ==1.4.8
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
@@ -1991,7 +1990,7 @@ default-package-overrides:
   - zip ==0.1.3
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
-  - zlib ==0.6.1.1
+  - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
   - zoom-refs ==0.0.0.1
@@ -2012,7 +2011,7 @@ extra-packages:
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
-  - hoogle < 5                          # required by current implementation of ghcWithHoogle
+  - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
@@ -2218,6 +2217,7 @@ dont-distribute-packages:
   al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2241,7 +2241,11 @@ dont-distribute-packages:
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-apigateway:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2360,8 +2364,10 @@ dont-distribute-packages:
   authenticate-ldap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  autom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avers-api-docs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2724,6 +2730,7 @@ dont-distribute-packages:
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   charsetdetect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chart-gtk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2736,6 +2743,7 @@ dont-distribute-packages:
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale-geo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2844,6 +2852,7 @@ dont-distribute-packages:
   collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colonnade:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3027,6 +3036,7 @@ dont-distribute-packages:
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3109,6 +3119,8 @@ dont-distribute-packages:
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBlimited:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbmigrations-mysql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbmigrations-postgresql:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbmigrations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3177,6 +3189,7 @@ dont-distribute-packages:
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dia-functions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3410,6 +3423,7 @@ dont-distribute-packages:
   error-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ert:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3483,6 +3497,7 @@ dont-distribute-packages:
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3518,6 +3533,7 @@ dont-distribute-packages:
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3796,6 +3812,7 @@ dont-distribute-packages:
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-variables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4120,6 +4137,8 @@ dont-distribute-packages:
   haskell-tools-ast-gen:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-demo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-prettyprint:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-refactor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4300,6 +4319,9 @@ dont-distribute-packages:
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat-tagsoup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4397,10 +4419,6 @@ dont-distribute-packages:
   HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-ui:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4469,6 +4487,8 @@ dont-distribute-packages:
   hoovie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4642,6 +4662,7 @@ dont-distribute-packages:
   hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstidy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstorchat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstox:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstradeking:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HStringTemplateHelpers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4681,6 +4702,7 @@ dont-distribute-packages:
   httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubigraph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HueAPI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4702,11 +4724,18 @@ dont-distribute-packages:
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-bits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-eliasfano:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-packed-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4719,6 +4748,7 @@ dont-distribute-packages:
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxt-expat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-filter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxthelper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxweb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4737,6 +4767,7 @@ dont-distribute-packages:
   hydrogen-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4848,6 +4879,7 @@ dont-distribute-packages:
   IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iothread:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip2location:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4913,6 +4945,7 @@ dont-distribute-packages:
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4954,6 +4987,7 @@ dont-distribute-packages:
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   juandelacosa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  juicy-gcode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuicyPixels-canvas:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuicyPixels-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuicyPixels-repa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4961,6 +4995,7 @@ dont-distribute-packages:
   JunkDB-driver-hashtables:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JunkDB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jupyter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kaleidoscope:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5108,6 +5143,7 @@ dont-distribute-packages:
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   leetify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5212,6 +5248,7 @@ dont-distribute-packages:
   list-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ListTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5346,6 +5383,7 @@ dont-distribute-packages:
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marvin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   marxup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5549,6 +5587,7 @@ dont-distribute-packages:
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multihash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5594,6 +5633,7 @@ dont-distribute-packages:
   n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NameGenerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5634,8 +5674,10 @@ dont-distribute-packages:
   nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-input-glfw:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-input:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5707,6 +5749,7 @@ dont-distribute-packages:
   notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5724,6 +5767,7 @@ dont-distribute-packages:
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauthenticated:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5945,6 +5989,7 @@ dont-distribute-packages:
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6114,6 +6159,7 @@ dont-distribute-packages:
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6204,6 +6250,7 @@ dont-distribute-packages:
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rattletrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6223,6 +6270,8 @@ dont-distribute-packages:
   reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6485,6 +6534,7 @@ dont-distribute-packages:
   Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6504,6 +6554,7 @@ dont-distribute-packages:
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6523,10 +6574,15 @@ dont-distribute-packages:
   serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-server:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-api:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-elm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6596,6 +6652,7 @@ dont-distribute-packages:
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6634,6 +6691,7 @@ dont-distribute-packages:
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sindre:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6987,6 +7045,7 @@ dont-distribute-packages:
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teeth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  telegram-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tellbot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7224,6 +7283,7 @@ dont-distribute-packages:
   type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-process:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7318,6 +7378,7 @@ dont-distribute-packages:
   var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   variable-precision:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7341,6 +7402,7 @@ dont-distribute-packages:
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7536,6 +7598,7 @@ dont-distribute-packages:
   xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-to-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7598,6 +7661,7 @@ dont-distribute-packages:
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-zendesk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 9020f1ee467..673099e0dc4 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, ghc
+{ pkgs, stdenv, ghc, all-cabal-hashes
 , compilerConfig ? (self: super: {})
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
@@ -6,14 +6,6 @@
 
 let
 
-  allCabalFiles = stdenv.mkDerivation {
-    name = "all-cabal-hashes-0";
-    buildCommand = ''
-      mkdir -p $out
-      tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"}
-    '';
-  };
-
   inherit (stdenv.lib) fix' extends;
 
   haskellPackages = self:
@@ -69,8 +61,8 @@ let
         installPhase = ''
           export HOME="$TMP"
           mkdir $out
-          hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json)
-          cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix
+          hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json)
+          cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix
         '';
       };
 
@@ -88,7 +80,6 @@ let
             packages = selectFrom self;
             hoogle = callPackage ./hoogle.nix {
               inherit packages;
-              hoogle = self.hoogle_5_0_4;
             };
           in withPackages (packages ++ [ hoogle ]);
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 114c40d6179..e45070068ee 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2487,8 +2487,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.8";
-       sha256 = "7181289529ba96df4946c2e9018cabf3d8566da1a11a2a7e0f0eb8c39e9e70dc";
+       version = "1.8.1";
+       sha256 = "635241e4b6b8aa1ddeb244c94002edc21603617fadeaf50aa7f52e28493ba15e";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -2504,8 +2504,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.8";
-       sha256 = "05cf006424750562dc786cc5eb169474759932c05da6ec08a44b932b72b620ec";
+       version = "1.8.1";
+       sha256 = "b21494feb055a55674b66d51f0522af9c06094ed86ba62db93fba54179c47c14";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -2523,8 +2523,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.8";
-       sha256 = "d5c3e7235a98683337dc44127bc19998d747e37fa2d4211f2142ac51a5288558";
+       version = "1.8.1";
+       sha256 = "1c2e12d7719e6798721a3957e6df6ea772dff0bd7d6900e5a1f5c009cd5635bb";
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -2542,8 +2542,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.8";
-       sha256 = "2bf9b59cf417a263cfe29fdc18135c8abfb997d5468e47ccaf9a756afde61aec";
+       version = "1.8.1";
+       sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2551,6 +2551,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-simple" = callPackage
@@ -5093,6 +5094,7 @@ self: {
        homepage = "https://github.com/yuhangwang/Files#readme";
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -10710,8 +10712,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "List";
-       version = "0.5.2";
-       sha256 = "27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac";
+       version = "0.6.0";
+       sha256 = "03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "List monad transformer and class";
@@ -10752,6 +10754,7 @@ self: {
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListWriter" = callPackage
@@ -11909,6 +11912,7 @@ self: {
        homepage = "http://github.com/pommicket/name-generator-haskell";
        description = "A name generator written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NanoProlog" = callPackage
@@ -15044,18 +15048,19 @@ self: {
 
   "SciFlow" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, directory
-     , executable-path, fgl, graphviz, lens, lifted-async, mtl
-     , optparse-applicative, rainbow, shelly, split, sqlite-simple
+     , exceptions, executable-path, fgl, graphviz, lens, lifted-async
+     , mtl, optparse-applicative, rainbow, shelly, split, sqlite-simple
      , template-haskell, text, th-lift, transformers, yaml
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.5.1";
-       sha256 = "bbd6d78dae17138dcd6e9849c156402bf1e65b71cc6bbfe3ca6bc64acc99422d";
+       version = "0.5.3.1";
+       sha256 = "8d8408047e57b245ea66577ded733244959c507ff1e2d014b3d3d9cfd66fdbf0";
        libraryHaskellDepends = [
-         base bytestring cereal containers directory executable-path fgl
-         graphviz lens lifted-async mtl optparse-applicative rainbow shelly
-         split sqlite-simple template-haskell text th-lift transformers yaml
+         base bytestring cereal containers directory exceptions
+         executable-path fgl graphviz lens lifted-async mtl
+         optparse-applicative rainbow shelly split sqlite-simple
+         template-haskell text th-lift transformers yaml
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
@@ -15172,31 +15177,6 @@ self: {
      }) {};
 
   "ShellCheck" = callPackage
-    ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , process, QuickCheck, regex-tdfa
-     }:
-     mkDerivation {
-       pname = "ShellCheck";
-       version = "0.4.4";
-       sha256 = "6cc50790d25b6f330037c3612c21460aa75839cc32c65e10ea6b35f9f4488768";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory json mtl parsec process QuickCheck
-         regex-tdfa
-       ];
-       executableHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
-       ];
-       testHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
-       ];
-       homepage = "http://www.shellcheck.net/";
-       description = "Shell script analysis tool";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "ShellCheck_0_4_5" = callPackage
     ({ mkDerivation, base, containers, directory, json, mtl, parsec
      , process, QuickCheck, regex-tdfa
      }:
@@ -15219,7 +15199,6 @@ self: {
        homepage = "http://www.shellcheck.net/";
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac" = callPackage
@@ -21010,6 +20989,7 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -21611,7 +21591,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka_1_4_4_1" = callPackage
+  "amazonka_1_4_4_2" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
      , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
      , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -21619,8 +21599,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.4.4.1";
-       sha256 = "0c0937d745ad39d34e1e6588497311721e4c7f995d0beab313def44893e47ede";
+       version = "1.4.4.2";
+       sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-conduit ini mmorph monad-control mtl resourcet
@@ -23082,6 +23062,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -23433,6 +23414,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Analytics SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -23933,6 +23915,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Service Catalog SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -23988,6 +23971,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export Snowball SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -24272,7 +24256,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-test_1_4_4" = callPackage
+  "amazonka-test_1_4_4_2" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
      , http-types, process, resourcet, tasty, tasty-hunit
@@ -24281,8 +24265,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.4.4";
-       sha256 = "5491b4cc27f41dd85daacaab0cc5e6b8630c5bb1581e3997f65d0b7b2ef6e5f0";
+       version = "1.4.4.2";
+       sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types process
@@ -26672,29 +26656,6 @@ self: {
      }) {};
 
   "asciidiagram" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
-     , rasterific-svg, svg-tree, text, vector
-     }:
-     mkDerivation {
-       pname = "asciidiagram";
-       version = "1.3.1.2";
-       sha256 = "dafcfba0d75da40e33bc3270b25c8cdd48f1cf07cc64d21f8eac4024d7ddddba";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers FontyFruity JuicyPixels lens linear mtl
-         rasterific-svg svg-tree text vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath FontyFruity JuicyPixels
-         optparse-applicative rasterific-svg svg-tree text
-       ];
-       description = "Pretty rendering of Ascii diagram into svg or png";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "asciidiagram_1_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
      , rasterific-svg, svg-tree, text, vector
@@ -26715,7 +26676,6 @@ self: {
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asic" = callPackage
@@ -27956,6 +27916,7 @@ self: {
        homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata";
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "automitive-cse" = callPackage
@@ -28095,18 +28056,18 @@ self: {
 
   "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, clock, containers, cryptohash, filepath, hspec
-     , inflections, MonadRandom, mtl, network, network-uri
-     , resource-pool, rethinkdb-client-driver, safe, scrypt, stm
-     , template-haskell, text, time, unordered-containers, vector
+     , bytestring, clock, containers, cryptohash, cryptonite, filepath
+     , hspec, inflections, memory, MonadRandom, mtl, network
+     , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt
+     , stm, template-haskell, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.16";
-       sha256 = "04221c75c07aa82789ce79674a0ba5add253855087fd42c123f1d77fb94f1c85";
+       version = "0.0.17.0";
+       sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
        libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring bytestring clock containers
-         cryptohash filepath inflections MonadRandom mtl network network-uri
+         aeson attoparsec base bytestring clock containers cryptonite
+         filepath inflections memory MonadRandom mtl network network-uri
          resource-pool rethinkdb-client-driver safe scrypt stm
          template-haskell text time unordered-containers vector
        ];
@@ -28127,8 +28088,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers-api";
-       version = "0.0.5";
-       sha256 = "469fa007854e5836e816cdf66d650f7b89601dd9644cf859ff680bb6b69d124c";
+       version = "0.0.17.0";
+       sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182";
        libraryHaskellDepends = [
          aeson avers base bytestring cookie http-api-data servant text time
          vector
@@ -28139,21 +28100,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avers-api-docs" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, cookie, lens
+     , servant, servant-swagger, swagger2, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "avers-api-docs";
+       version = "0.0.17.0";
+       sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f";
+       libraryHaskellDepends = [
+         aeson avers avers-api base cookie lens servant servant-swagger
+         swagger2 text unordered-containers
+       ];
+       homepage = "http://github.com/wereHamster/avers-api-docs";
+       description = "Swagger documentation for the Avers API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
-     , bytestring, bytestring-conversion, containers, cookie, cryptohash
-     , either, http-types, mtl, resource-pool, rethinkdb-client-driver
-     , servant, servant-server, stm, text, time, transformers, wai
-     , wai-websockets, websockets
+     , bytestring, bytestring-conversion, containers, cookie, cryptonite
+     , either, http-types, memory, mtl, resource-pool
+     , rethinkdb-client-driver, servant, servant-server, stm, text, time
+     , transformers, wai, wai-websockets, websockets
      }:
      mkDerivation {
        pname = "avers-server";
-       version = "0.0.5";
-       sha256 = "c72bd19a4f46c733875c887a0efcc7340f9c5b4571a5f74773d3d835297b2176";
+       version = "0.0.17.0";
+       sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
-         bytestring-conversion containers cookie cryptohash either
-         http-types mtl resource-pool rethinkdb-client-driver servant
+         bytestring-conversion containers cookie cryptonite either
+         http-types memory mtl resource-pool rethinkdb-client-driver servant
          servant-server stm text time transformers wai wai-websockets
          websockets
        ];
@@ -28743,6 +28722,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "axiomatic-classes" = callPackage
+    ({ mkDerivation, base, containers, control-invariants, lens
+     , monad-loops, mtl, portable-template-haskell-lens, QuickCheck
+     , quickcheck-report, semigroups, template-haskell, th-printf
+     , transformers
+     }:
+     mkDerivation {
+       pname = "axiomatic-classes";
+       version = "0.1.0.0";
+       sha256 = "d0ca9598451c66a2070a33fea29a7479acd9f742455c95b3fbfd0005375e0929";
+       libraryHaskellDepends = [
+         base containers control-invariants lens monad-loops mtl
+         portable-template-haskell-lens QuickCheck quickcheck-report
+         semigroups template-haskell th-printf transformers
+       ];
+       description = "Specify axioms for type classes and quickCheck all available instances";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {control-invariants = null;};
+
   "azure-acs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
      , conduit-extra, connection, http-conduit, http-types, network
@@ -32030,33 +32029,26 @@ self: {
      }) {};
 
   "bioinformatics-toolkit" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-     , bytestring-lexing, case-insensitive, clustering, colour, conduit
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+     , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, containers, data-default-class
-     , double-conversion, hexpat, http-conduit, IntervalMap
-     , math-functions, matrices, mtl, optparse-applicative, palette
-     , parallel, primitive, random, shelly, split, statistics, tasty
-     , tasty-golden, tasty-hunit, text, transformers
+     , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap
+     , math-functions, matrices, mtl, parallel, primitive, random, split
+     , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
      , unordered-containers, vector, vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.2.4";
-       sha256 = "e9ef7a074e8d7fd0d6fb7270f18010dd3d61c69bb06f421acf0930010181a25c";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.1";
+       sha256 = "f453503831f8a495bcc39e6fe3275f26bd2d50916b09415551b41a316998d543";
        libraryHaskellDepends = [
-         aeson aeson-pretty base binary bytestring bytestring-lexing
-         case-insensitive clustering colour conduit-combinators containers
-         data-default-class double-conversion hexpat http-conduit
-         IntervalMap math-functions matrices mtl palette parallel primitive
-         split statistics text transformers unordered-containers vector
+         aeson aeson-pretty base bytestring bytestring-lexing
+         case-insensitive clustering conduit-combinators containers
+         data-default-class double-conversion hexpat HsHTSLib http-conduit
+         IntervalMap math-functions matrices mtl parallel primitive split
+         statistics text transformers unordered-containers vector
          vector-algorithms word8
        ];
-       executableHaskellDepends = [
-         base bytestring clustering data-default-class double-conversion
-         optparse-applicative shelly split text
-       ];
        testHaskellDepends = [
          base bytestring conduit conduit-combinators data-default-class
          matrices mtl random tasty tasty-golden tasty-hunit
@@ -34309,8 +34301,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.11";
-       sha256 = "783192383bf8c2887a5b99aca4c8ec48a6ba91f3ee11591a7d8d98734eead2a5";
+       version = "0.13";
+       sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7";
        libraryHaskellDepends = [
          base containers contravariant data-default deepseq microlens
          microlens-mtl microlens-th template-haskell text text-zipper
@@ -34898,8 +34890,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.2.2.0";
-       sha256 = "f1a00142d77643a3da1ddabf9d9f1308e7ee1d8ea758d8161ed118a3d7c4123a";
+       version = "0.2.3.0";
+       sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c";
        libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
@@ -36634,8 +36626,8 @@ self: {
      }:
      mkDerivation {
        pname = "cairo";
-       version = "0.13.3.0";
-       sha256 = "fe895ad001228f56b167ab76de1d645f46966062544bf831b0fb9fa7e938ff08";
+       version = "0.13.3.1";
+       sha256 = "a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring mtl text utf8-string
@@ -37621,8 +37613,8 @@ self: {
      }:
      mkDerivation {
        pname = "casr-logbook-html";
-       version = "0.0.2";
-       sha256 = "0a9cadd97d0b821a78e262b858b6ab650c7e72274d640ec8d6c8806f9aa090bd";
+       version = "0.0.3";
+       sha256 = "3eb3cd24aa8ec50bc83a3e0e1b0864050d7d3e7d601a67c033ae88be362494bb";
        libraryHaskellDepends = [
          base casr-logbook-types digit lens lucid text time
        ];
@@ -38123,6 +38115,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.2.1.0";
+       sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -39205,6 +39218,7 @@ self: {
        homepage = "https://github.com/marcusbuffett/chitauri";
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "choose" = callPackage
@@ -39371,8 +39385,8 @@ self: {
      }:
      mkDerivation {
        pname = "chronos";
-       version = "0.1.0";
-       sha256 = "ce21a30d63f79e8885ff45248b7578a8d02ce7ed562a7f3cebb302be64d092b3";
+       version = "0.2.0";
+       sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -39381,7 +39395,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/andrewthad/chronos#readme";
-       description = "Initial project template from stack";
+       description = "A time library, encoding, decoding, and instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41640,6 +41654,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cold-widow" = callPackage
+    ({ mkDerivation, base, bytestring, hspec }:
+     mkDerivation {
+       pname = "cold-widow";
+       version = "0.1.2";
+       sha256 = "2452aff29af68c8c093ebf492e5e6598a90bac3be64f48c081864dd7c02515e4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/mihaigiurgeanu/cold-widow#readme";
+       description = "File transfer via QR Codes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "collada-output" = callPackage
     ({ mkDerivation, base, collada-types, containers, SVGPath, time
      , vector, xml
@@ -41772,6 +41802,7 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "color-counter" = callPackage
@@ -42930,8 +42961,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "concurrent-split";
-       version = "0.0.0.1";
-       sha256 = "4b7f4a40bc8dbbd3437f460a2eabe78fed84c900ca2912e523b281c311e03177";
+       version = "0.0.1";
+       sha256 = "60793c8eeff1fa0fe03910951d1925f3c66aec61ead64bf3f98dd6110a05b8e7";
        libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
@@ -43622,8 +43653,8 @@ self: {
      }:
      mkDerivation {
        pname = "configurator-ng";
-       version = "0.0.0.0";
-       sha256 = "4995a132a0fcbf80c47198daab2530dd09ff87f227b265354236e188d8ec8aa5";
+       version = "0.0.0.1";
+       sha256 = "3a367ad5dd04bddb891600899b99cbefa4bb53e44c83ebab114dacd1b68f012b";
        libraryHaskellDepends = [
          attoparsec base bytestring critbit data-ordlist directory dlist
          fail hashable scientific text unix-compat unordered-containers
@@ -47397,6 +47428,7 @@ self: {
        homepage = "https://github.com/mgattozzi/curryrs#readme";
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cursedcsv" = callPackage
@@ -49995,6 +50027,7 @@ self: {
        ];
        description = "The dbmigrations tool built for MySQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbmigrations-postgresql" = callPackage
@@ -50013,6 +50046,7 @@ self: {
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbmigrations-sqlite" = callPackage
@@ -50643,8 +50677,8 @@ self: {
      }:
      mkDerivation {
        pname = "declarative";
-       version = "0.2.2";
-       sha256 = "2201fb8299231ad5017a4ebf429d5036f7d3950df8cf3e684173fa7d658cac8e";
+       version = "0.2.3";
+       sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa";
        libraryHaskellDepends = [
          base hasty-hamiltonian lens mcmc-types mighty-metropolis
          mwc-probability pipes primitive speedy-slice transformers
@@ -51908,6 +51942,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -52907,8 +52942,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors";
-       version = "0.8.1.0";
-       sha256 = "3c2bba9783279cb52d7fdbd03f0cea46b6f2c23f788953016568cd8f0a389c8a";
+       version = "0.8.1.1";
+       sha256 = "3c42b7b8b89369d305621a7753c245a6250deb58bc848dd3d757e06d69f842a8";
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale text time
        ];
@@ -52930,8 +52965,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.19";
-       sha256 = "eb58a68fee918486e6ef884e946898427a75ddc6c3d1d509dd9a475341b6daa7";
+       version = "1.1.20";
+       sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -52952,8 +52987,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-blaze";
-       version = "0.6.0.6";
-       sha256 = "b11b6c0268a31353b915894452d0a78162e0ead933baeb4e6e49b384b869a8cf";
+       version = "0.6.1.0";
+       sha256 = "4be758620386fc395367b15b81b9fb7373e5ee370ab9af52fa03b2c24c579f0d";
        libraryHaskellDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
@@ -53376,6 +53411,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "direct-sqlite_2_3_18" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.18";
+       sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       homepage = "https://github.com/IreneKnapp/direct-sqlite";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "directed-cubical" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , parallel, QuickCheck, unordered-containers, vector
@@ -55070,14 +55123,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "download_0_3_2_5" = callPackage
+    ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }:
+     mkDerivation {
+       pname = "download";
+       version = "0.3.2.5";
+       sha256 = "9ae6d92ae4fe7ec4ff7281896254a7794e4caf85b6743280afd2074865dd99c0";
+       libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/psibi/download";
+       description = "High-level file download based on URLs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "download-curl" = callPackage
     ({ mkDerivation, base, bytestring, curl, feed, tagsoup, xml }:
      mkDerivation {
        pname = "download-curl";
        version = "0.1.4";
        sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1";
-       revision = "1";
-       editedCabalFile = "7e6df1d4f39879e9b031c8ff5e2f6fd5be3729cc40f7515e117ac0b47ed3f675";
+       revision = "2";
+       editedCabalFile = "d4df109a694aacf11814f7d0ea8df2aa6b187ea894f1e6ae1bddae635f0a4e0c";
        libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
@@ -58947,6 +59014,7 @@ self: {
        homepage = "https://github.com/EarthCitizen/escape-artist#readme";
        description = "ANSI Escape Sequence Text Decoration Made Easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esotericbot" = callPackage
@@ -59842,20 +59910,26 @@ self: {
      }) {};
 
   "existential" = callPackage
-    ({ mkDerivation, base, lens, QuickCheck, template-haskell }:
+    ({ mkDerivation, base, cereal, constraints, control-invariants
+     , lens, portable-template-haskell-lens, QuickCheck
+     , quickcheck-report, serialize-instances, tagged, template-haskell
+     , th-printf, unordered-containers
+     }:
      mkDerivation {
        pname = "existential";
-       version = "0.1.0.0";
-       sha256 = "1aea3b930ba0343fb9f3d8bef2d96dde79b9fb353ce80b6a93c9d99599c6b46a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base lens QuickCheck template-haskell ];
-       executableHaskellDepends = [ base lens ];
-       homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home";
-       description = "A library for existential types";
+       version = "0.2.0.0";
+       sha256 = "756bf090bdf84aae4ffb8f3f7ceefe95eb772853d71edc369dd789d9fde6136e";
+       libraryHaskellDepends = [
+         base cereal constraints control-invariants lens
+         portable-template-haskell-lens QuickCheck quickcheck-report
+         serialize-instances tagged template-haskell th-printf
+         unordered-containers
+       ];
+       description = "Existential types with lens-like accessors";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {control-invariants = null;};
 
   "exists" = callPackage
     ({ mkDerivation, base, contravariant }:
@@ -61052,12 +61126,13 @@ self: {
     ({ mkDerivation, fay-base }:
      mkDerivation {
        pname = "fay-simplejson";
-       version = "0.1.1.0";
-       sha256 = "78dbb8ad24149e93706d3630d5c9dcab9b263c0614e437eb14a6983953833c04";
+       version = "0.1.3.0";
+       sha256 = "b8d711a62c40b587b9266eef199ad83e2f0403c5883a8e1c75f5dc34e8368033";
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/Lupino/fay-simplejson";
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-text" = callPackage
@@ -61423,8 +61498,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed-gipeda";
-       version = "0.3.0.0";
-       sha256 = "8a440f45d32a3eb0db3785b20601bd3031560da5776569d4c20762de3c44a98d";
+       version = "0.3.0.1";
+       sha256 = "5fa85807a74e5759635106deef4509e807d42f61d108d91645fe9cd0fec7a8cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64070,6 +64145,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "formatting_6_2_3" = callPackage
+    ({ mkDerivation, base, clock, old-locale, scientific, text
+     , text-format, time
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.2.3";
+       sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc";
+       libraryHaskellDepends = [
+         base clock old-locale scientific text text-format time
+       ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forml" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -65075,12 +65166,12 @@ self: {
      }) {};
 
   "from-sum" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
+    ({ mkDerivation, base, doctest, Glob, mtl }:
      mkDerivation {
        pname = "from-sum";
-       version = "0.1.2.0";
-       sha256 = "29449f195710ecdc601375ad0f853666bb93baf11f279b6f9f31783455cc51d9";
-       libraryHaskellDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4";
+       libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/cdepillabout/from-sum";
        description = "Canonical fromMaybeM and fromEitherM functions";
@@ -67708,6 +67799,8 @@ self: {
        pname = "ghc-mod";
        version = "5.6.0.0";
        sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e";
+       revision = "3";
+       editedCabalFile = "d21d034e1e1df7a5b478e2fd8dad0e11e01e46ce095ea39a90acacfdd34661ea";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [
@@ -69366,8 +69459,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.3.5.0";
-       sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe";
+       version = "0.3.5.3";
+       sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69419,8 +69512,8 @@ self: {
      }:
      mkDerivation {
        pname = "gio";
-       version = "0.13.3.0";
-       sha256 = "f20d17c56ee29cdd102234c00be1cdf0e5c12b7abe6c0a9723668a6f72a57417";
+       version = "0.13.3.1";
+       sha256 = "ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring containers glib mtl
@@ -69589,8 +69682,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161027";
-       sha256 = "1e4d859434d5175bbe29843e3be03350e7412063bc340d12a1e31e04c80791cf";
+       version = "6.20161031";
+       sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -69913,17 +70006,17 @@ self: {
      }) {};
 
   "gitcache" = callPackage
-    ({ mkDerivation, base, cryptohash, directory, filepath, process
+    ({ mkDerivation, base, cryptonite, directory, filepath, process
      , utf8-string
      }:
      mkDerivation {
        pname = "gitcache";
-       version = "0.2";
-       sha256 = "fe69fd3f8ec4bff1dfb85d67279d71161c6cf6e6f05fe93df33776162640a56d";
+       version = "0.3";
+       sha256 = "52d2a4243eb1a385bee7665259efbba41a33e1ad57e59c59912b56d469a21e5d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base cryptohash directory filepath process utf8-string
+         base cryptonite directory filepath process utf8-string
        ];
        homepage = "https://github.com/vincenthz/gitcache";
        description = "Simple git utility to use and manage clone cache";
@@ -69952,27 +70045,25 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
      , file-embed, hashable, hspec, http-client, http-client-tls
      , http-link-header, http-types, iso8601-time, mtl, network-uri
-     , semigroups, text, time, transformers, transformers-compat
+     , semigroups, text, time, tls, transformers, transformers-compat
      , unordered-containers, vector, vector-instances
      }:
      mkDerivation {
        pname = "github";
-       version = "0.14.1";
-       sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d";
-       revision = "1";
-       editedCabalFile = "a03fc2c579eb4451933e82486f705a81480c030eb17c47c4bccd07fb1e302584";
+       version = "0.15.0";
+       sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609";
        libraryHaskellDepends = [
-         aeson aeson-compat attoparsec base base-compat base16-bytestring
-         binary binary-orphans byteable bytestring containers cryptohash
-         deepseq deepseq-generics exceptions hashable http-client
-         http-client-tls http-link-header http-types iso8601-time mtl
-         network-uri semigroups text time transformers transformers-compat
-         unordered-containers vector vector-instances
+         aeson aeson-compat base base-compat base16-bytestring binary
+         binary-orphans byteable bytestring containers cryptohash deepseq
+         deepseq-generics exceptions hashable http-client http-client-tls
+         http-link-header http-types iso8601-time mtl network-uri semigroups
+         text time tls transformers transformers-compat unordered-containers
+         vector vector-instances
        ];
        testHaskellDepends = [
          aeson-compat base base-compat file-embed hspec unordered-containers
@@ -70103,8 +70194,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhook-handler-snap";
-       version = "0.0.6";
-       sha256 = "ec62b61aeb429492b347ed327b14a4c1bcf44d3791ac61ee6989f8a0a608a80e";
+       version = "0.0.7";
+       sha256 = "d4f526f4027a0c1cd9bdf455fbfb0c1742539eb3379b22ba59f1647133202c91";
        libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
@@ -70474,6 +70565,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_1_3_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.1.3.0";
+       sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       homepage = "https://github.com/MichelBoucey/glabrous";
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }:
      mkDerivation {
@@ -70563,8 +70676,8 @@ self: {
      }:
      mkDerivation {
        pname = "glib";
-       version = "0.13.4.0";
-       sha256 = "8bbc24b8a7f4de0fc02d60f12bf1b5154a151ffcad25964b65e958977100a0d9";
+       version = "0.13.4.1";
+       sha256 = "f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring containers text utf8-string
@@ -70683,6 +70796,7 @@ self: {
        homepage = "https://github.com/rdnetto/glob-posix#readme";
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "global" = callPackage
@@ -71215,8 +71329,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.17";
-       sha256 = "4f40d2896ac66c3a42daaa8849639e4a98bc8152c1d28933a6aaaceb8679dfe6";
+       version = "0.1.18";
+       sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71462,6 +71576,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
+     , conduit-extra, cryptonite, directory, exceptions, filepath
+     , gogol-core, http-client, http-conduit, http-media, http-types
+     , lens, memory, mime-types, monad-control, mtl, resourcet, text
+     , time, transformers, transformers-base, unordered-containers, x509
+     , x509-store
+     }:
+     mkDerivation {
+       pname = "gogol";
+       version = "0.1.1";
+       sha256 = "1dee6d069d6c239c8afa2240bdfc4e9674e9e648822617574732e4dc74834db2";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive conduit conduit-extra
+         cryptonite directory exceptions filepath gogol-core http-client
+         http-conduit http-media http-types lens memory mime-types
+         monad-control mtl resourcet text time transformers
+         transformers-base unordered-containers x509 x509-store
+       ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Comprehensive Google Services SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adexchange-buyer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71474,6 +71613,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-buyer_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-buyer";
+       version = "0.1.1";
+       sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Buyer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adexchange-seller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71486,6 +71638,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-seller_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-seller";
+       version = "0.1.1";
+       sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Seller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-datatransfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71498,6 +71663,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-datatransfer_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-datatransfer";
+       version = "0.1.1";
+       sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Data Transfer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-directory" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71510,6 +71688,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-directory_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-directory";
+       version = "0.1.1";
+       sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Directory SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-emailmigration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71522,6 +71713,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-emailmigration_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-emailmigration";
+       version = "0.1.1";
+       sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Email Migration API v2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-reports" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71534,6 +71738,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-reports_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-reports";
+       version = "0.1.1";
+       sha256 = "5621ea9daeb864dcd0c5bb576645bbf5b6726da2e9313cd6b2514c7e2e394ccd";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Reports SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adsense" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71546,6 +71763,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adsense_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adsense";
+       version = "0.1.1";
+       sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google AdSense Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adsense-host" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71558,6 +71788,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adsense-host_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adsense-host";
+       version = "0.1.1";
+       sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google AdSense Host SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-affiliates" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71570,6 +71813,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-affiliates_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-affiliates";
+       version = "0.1.1";
+       sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Affiliate Network SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-analytics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71582,6 +71838,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-analytics_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-analytics";
+       version = "0.1.1";
+       sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-enterprise" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71594,6 +71863,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-enterprise_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-enterprise";
+       version = "0.1.1";
+       sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play EMM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-publisher" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71606,6 +71888,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-publisher_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-publisher";
+       version = "0.1.1";
+       sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appengine" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71618,6 +71913,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appengine_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appengine";
+       version = "0.1.1";
+       sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App Engine Admin SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-activity" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71630,6 +71938,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-activity_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-activity";
+       version = "0.1.1";
+       sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Activity SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-calendar" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71642,6 +71963,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-calendar_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-calendar";
+       version = "0.1.1";
+       sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Calendar SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-licensing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71654,6 +71988,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-licensing_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-licensing";
+       version = "0.1.1";
+       sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise License Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-reseller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71666,6 +72013,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-reseller_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-reseller";
+       version = "0.1.1";
+       sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise Apps Reseller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-tasks" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71678,6 +72038,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-tasks_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-tasks";
+       version = "0.1.1";
+       sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tasks SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appstate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71690,6 +72063,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appstate_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appstate";
+       version = "0.1.1";
+       sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App State SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-autoscaler" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71702,6 +72088,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-autoscaler_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-autoscaler";
+       version = "0.1.1";
+       sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Autoscaler SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-bigquery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71714,6 +72113,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-bigquery_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-bigquery";
+       version = "0.1.1";
+       sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google BigQuery SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-billing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71726,6 +72138,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-billing_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-billing";
+       version = "0.1.1";
+       sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Billing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-blogger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71738,6 +72163,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-blogger_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-blogger";
+       version = "0.1.1";
+       sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Blogger SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-books" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71750,6 +72188,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-books_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-books";
+       version = "0.1.1";
+       sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Books SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-civicinfo" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71762,6 +72213,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-civicinfo_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-civicinfo";
+       version = "0.1.1";
+       sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Civic Information SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-classroom" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71774,6 +72238,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-classroom_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-classroom";
+       version = "0.1.1";
+       sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Classroom SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-cloudmonitoring" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71786,6 +72263,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudmonitoring_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudmonitoring";
+       version = "0.1.1";
+       sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-cloudtrace" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71798,6 +72288,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudtrace_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudtrace";
+       version = "0.1.1";
+       sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Trace SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-compute" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71810,6 +72313,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-compute_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-compute";
+       version = "0.1.1";
+       sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-container" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71822,6 +72338,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-container_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-container";
+       version = "0.1.1";
+       sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Container Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-containerbuilder" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-containerbuilder";
+       version = "0.1.1";
+       sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Container Builder SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
@@ -71847,6 +72388,30 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-core_0_1_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, dlist, exceptions, hashable
+     , http-api-data, http-client, http-media, http-types, lens, memory
+     , resourcet, scientific, servant, tasty, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gogol-core";
+       version = "0.1.1";
+       sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit dlist exceptions hashable http-api-data http-client
+         http-media http-types lens memory resourcet scientific servant text
+         time unordered-containers
+       ];
+       testHaskellDepends = [ base tasty ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Core data types and functionality for Gogol libraries";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-customsearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71859,6 +72424,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-customsearch_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-customsearch";
+       version = "0.1.1";
+       sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google CustomSearch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataflow" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71871,6 +72449,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataflow_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataflow";
+       version = "0.1.1";
+       sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Dataflow SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataproc" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71883,6 +72474,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataproc_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataproc";
+       version = "0.1.1";
+       sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Dataproc SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-datastore" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71895,6 +72499,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-datastore_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-datastore";
+       version = "0.1.1";
+       sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Datastore SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-debugger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71907,6 +72524,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-debugger_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-debugger";
+       version = "0.1.1";
+       sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Debugger SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-deploymentmanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71919,6 +72549,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-deploymentmanager_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-deploymentmanager";
+       version = "0.1.1";
+       sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Deployment Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dfareporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71931,6 +72574,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dfareporting_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dfareporting";
+       version = "0.1.1";
+       sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DCM/DFA Reporting And Trafficking SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-discovery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71943,6 +72599,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-discovery_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-discovery";
+       version = "0.1.1";
+       sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google APIs Discovery Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dns" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71955,6 +72624,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dns_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dns";
+       version = "0.1.1";
+       sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud DNS SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-doubleclick-bids" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71967,6 +72649,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-doubleclick-bids_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-doubleclick-bids";
+       version = "0.1.1";
+       sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DoubleClick Bid Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-doubleclick-search" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71979,6 +72674,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-doubleclick-search_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-doubleclick-search";
+       version = "0.1.1";
+       sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DoubleClick Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-drive" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71991,6 +72699,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-drive_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-drive";
+       version = "0.1.1";
+       sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Drive SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-firebase-dynamiclinks" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-firebase-dynamiclinks";
+       version = "0.1.1";
+       sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Firebase Dynamic Links SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-firebase-rules" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72003,6 +72736,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-firebase-rules_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-firebase-rules";
+       version = "0.1.1";
+       sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Firebase Rules SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fitness" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72015,6 +72761,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fitness_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fitness";
+       version = "0.1.1";
+       sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fitness SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fonts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72027,6 +72786,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fonts_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fonts";
+       version = "0.1.1";
+       sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fonts Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-freebasesearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72039,6 +72811,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-freebasesearch_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-freebasesearch";
+       version = "0.1.1";
+       sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Freebase Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fusiontables" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72051,6 +72836,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fusiontables_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fusiontables";
+       version = "0.1.1";
+       sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fusion Tables SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72063,6 +72861,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games";
+       version = "0.1.1";
+       sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-configuration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72075,6 +72886,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-configuration_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-configuration";
+       version = "0.1.1";
+       sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Publishing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-management" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72087,6 +72911,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-management_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-management";
+       version = "0.1.1";
+       sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-genomics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72099,6 +72936,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-genomics_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-genomics";
+       version = "0.1.1";
+       sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Genomics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-gmail" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72111,6 +72961,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-gmail_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-gmail";
+       version = "0.1.1";
+       sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Gmail SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-migration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72123,6 +72986,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-groups-migration_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-groups-migration";
+       version = "0.1.1";
+       sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Groups Migration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-settings" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72135,6 +73011,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-groups-settings_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-groups-settings";
+       version = "0.1.1";
+       sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Groups Settings SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-iam" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-iam";
+       version = "0.1.1";
+       sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Identity and Access Management (IAM) SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-identity-toolkit" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72147,6 +73048,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-identity-toolkit_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-identity-toolkit";
+       version = "0.1.1";
+       sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Identity Toolkit SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-kgsearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72159,6 +73073,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-kgsearch_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-kgsearch";
+       version = "0.1.1";
+       sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Knowledge Graph Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-latencytest" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72171,6 +73098,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-latencytest_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-latencytest";
+       version = "0.1.1";
+       sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Network Performance Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-logging" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72183,6 +73123,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-logging_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-logging";
+       version = "0.1.1";
+       sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Logging SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-maps-coordinate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72195,6 +73148,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-maps-coordinate_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-maps-coordinate";
+       version = "0.1.1";
+       sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Maps Coordinate SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-maps-engine" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72207,6 +73173,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-maps-engine_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-maps-engine";
+       version = "0.1.1";
+       sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Maps Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-mirror" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72219,6 +73198,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-mirror_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-mirror";
+       version = "0.1.1";
+       sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Mirror SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-ml" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-ml";
+       version = "0.1.1";
+       sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Machine Learning SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-monitoring" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72231,6 +73235,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-monitoring_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-monitoring";
+       version = "0.1.1";
+       sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-oauth2" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72243,6 +73260,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-oauth2_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-oauth2";
+       version = "0.1.1";
+       sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google OAuth2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-pagespeed" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72255,6 +73285,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pagespeed_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pagespeed";
+       version = "0.1.1";
+       sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google PageSpeed Insights SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-partners" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72267,6 +73310,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-partners_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-partners";
+       version = "0.1.1";
+       sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Partners SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-people" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72279,6 +73335,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-people_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-people";
+       version = "0.1.1";
+       sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google People SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-play-moviespartner" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72291,6 +73360,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-play-moviespartner_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-play-moviespartner";
+       version = "0.1.1";
+       sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Movies Partner SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72303,6 +73385,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-plus_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-plus";
+       version = "0.1.1";
+       sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google + SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus-domains" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72315,6 +73410,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-plus-domains_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-plus-domains";
+       version = "0.1.1";
+       sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google + Domains SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-prediction" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72327,6 +73435,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-prediction_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-prediction";
+       version = "0.1.1";
+       sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Prediction SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-proximitybeacon" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72339,6 +73460,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-proximitybeacon_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-proximitybeacon";
+       version = "0.1.1";
+       sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Proximity Beacon SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-pubsub" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72351,6 +73485,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pubsub_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pubsub";
+       version = "0.1.1";
+       sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Pub/Sub SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-qpxexpress" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72363,6 +73510,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-qpxexpress_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-qpxexpress";
+       version = "0.1.1";
+       sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google QPX Express SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72375,6 +73535,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool";
+       version = "0.1.1";
+       sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool-updater" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72387,6 +73560,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool-updater_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool-updater";
+       version = "0.1.1";
+       sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Updater SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-resourcemanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72399,6 +73585,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-resourcemanager_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-resourcemanager";
+       version = "0.1.1";
+       sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Resource Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-resourceviews" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72411,6 +73610,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-resourceviews_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-resourceviews";
+       version = "0.1.1";
+       sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Groups SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-runtimeconfig" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-runtimeconfig";
+       version = "0.1.1";
+       sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud RuntimeConfig SDK";
+       license = "unknown";
+     }) {};
+
+  "gogol-safebrowsing" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-safebrowsing";
+       version = "0.1.1";
+       sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Safe Browsing APIs SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-script" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72423,6 +73659,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-script_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-script";
+       version = "0.1.1";
+       sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Script Execution SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-servicecontrol" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-servicecontrol";
+       version = "0.1.1";
+       sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Service Control SDK";
+       license = "unknown";
+     }) {};
+
+  "gogol-servicemanagement" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-servicemanagement";
+       version = "0.1.1";
+       sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Service Management SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-sheets" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72435,6 +73708,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sheets_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sheets";
+       version = "0.1.1";
+       sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Sheets SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-shopping-content" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72447,6 +73733,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-shopping-content_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-shopping-content";
+       version = "0.1.1";
+       sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Content API for Shopping SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-siteverification" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72459,6 +73758,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-siteverification_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-siteverification";
+       version = "0.1.1";
+       sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Site Verification SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-spectrum" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72471,6 +73783,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-spectrum_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-spectrum";
+       version = "0.1.1";
+       sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Spectrum Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-sqladmin" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72483,6 +73808,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sqladmin_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sqladmin";
+       version = "0.1.1";
+       sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud SQL Administration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-storage" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72495,6 +73833,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-storage_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-storage";
+       version = "0.1.1";
+       sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Storage JSON SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-storage-transfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72507,6 +73858,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-storage-transfer_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-storage-transfer";
+       version = "0.1.1";
+       sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Storage Transfer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-tagmanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72519,6 +73883,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-tagmanager_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-tagmanager";
+       version = "0.1.1";
+       sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tag Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-taskqueue" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72531,6 +73908,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-taskqueue_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-taskqueue";
+       version = "0.1.1";
+       sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google TaskQueue SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-translate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72543,6 +73933,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-translate_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-translate";
+       version = "0.1.1";
+       sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Translate SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-urlshortener" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72555,6 +73958,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-urlshortener_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-urlshortener";
+       version = "0.1.1";
+       sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google URL Shortener SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-useraccounts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72567,6 +73983,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-useraccounts_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-useraccounts";
+       version = "0.1.1";
+       sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud User Accounts SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-vision" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72579,6 +74008,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-vision_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-vision";
+       version = "0.1.1";
+       sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Vision SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-webmaster-tools" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72591,6 +74033,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-webmaster-tools_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-webmaster-tools";
+       version = "0.1.1";
+       sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Search Console SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72603,6 +74058,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube";
+       version = "0.1.1";
+       sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Data SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-analytics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72615,6 +74083,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-analytics_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-analytics";
+       version = "0.1.1";
+       sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-reporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72627,6 +74108,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-reporting_0_1_1" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-reporting";
+       version = "0.1.1";
+       sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Reporting SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gooey" = callPackage
     ({ mkDerivation, base, renderable, transformers, varying }:
      mkDerivation {
@@ -72764,6 +74258,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-jwt_0_1_2_1" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+     , RSA, text, unix-time
+     }:
+     mkDerivation {
+       pname = "google-oauth2-jwt";
+       version = "0.1.2.1";
+       sha256 = "1a727b31280b53cb9db6531b8580dba8843a4beba0e866f34ff0231e7590b72b";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+       ];
+       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
+       description = "Get a signed JWT for Google Service Accounts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "google-search" = callPackage
     ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
@@ -73827,13 +75338,13 @@ self: {
      }:
      mkDerivation {
        pname = "gray-extended";
-       version = "1.5.1";
-       sha256 = "588c64add3715a78cac2e80ccd37ba501d03d27f43acbf8b98a4a5cb2c8a55d1";
+       version = "1.5.2";
+       sha256 = "d56ae799ff03d5c4a4350d260be822cd3b3ff6fc8ed5e4b04f513579485fc9ca";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/gray-extended";
+       homepage = "https://github.com/mhwombat/gray-extended#readme";
        description = "Gray encoding schemes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73956,14 +75467,14 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.6";
-       sha256 = "a511a0146446018536176c84e5a134c9bc5ad477717c24bff3e92d52d40bf352";
+       version = "7.8.7";
+       sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/grid";
+       homepage = "https://github.com/mhwombat/grid#readme";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74439,8 +75950,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.14.5";
-       sha256 = "ffdfb54247dfbdf3b9936504802e3e0d2238cf5a0c145e745899d2c17f7c7001";
+       version = "0.14.6";
+       sha256 = "707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -74501,8 +76012,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-mac-integration";
-       version = "0.3.3.0";
-       sha256 = "639a8f6993a902346555f0cef188418fadb8f272f98d5f1f485e4c2b832641c3";
+       version = "0.3.3.1";
+       sha256 = "af651245db161e1b46f5a54ec04f908c40bbd7dc1f73df7531da8c78d2716b39";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
@@ -74737,8 +76248,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.14.5";
-       sha256 = "be24beff4a7fc08e7cb9b4e8d623f3ae884730c8dc22af12ab65efd362b0bc48";
+       version = "0.14.6";
+       sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -74755,8 +76266,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.3.0";
-       sha256 = "c55a0c38dca1904bef528568d914a76f349ba87279b4a8ed3997bb9ac6b0a2e3";
+       version = "0.3.3.1";
+       sha256 = "a5ba824ffc75f48c35e779f045cae753a0cdee9f78d69bbd9b9c5260d54ee0fc";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -74767,16 +76278,16 @@ self: {
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
-    ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
-     , pango
+    ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
+     , gtkglext, pango
      }:
      mkDerivation {
        pname = "gtkglext";
-       version = "0.12.5.0";
-       sha256 = "13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6";
+       version = "0.13.1.1";
+       sha256 = "70f0b6e42dd8635d5c4d852e497b0bd34683a363e7c016bfc8e5d11e84036497";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
@@ -74827,8 +76338,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtksourceview2";
-       version = "0.13.3.0";
-       sha256 = "20747e2bff7b9e49bc4952a4ba706c72c02edafdb7eb86e00038dd438b5937cc";
+       version = "0.13.3.1";
+       sha256 = "a1c5ebc07faa5b2809d424b3ded5e9cfa0a5338b51c7989e2a0271d016c5fe53";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk mtl text
@@ -74845,8 +76356,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtksourceview3";
-       version = "0.13.3.0";
-       sha256 = "c260f3d49e3ee2e3da2e9884f948e904b7e376bb885d0ce7da346bcab58042f2";
+       version = "0.13.3.1";
+       sha256 = "9a7e12fda53d532668ee7f830c0aacf43c8a0c9a65f571fa81088a7372383b7b";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
@@ -75205,6 +76716,7 @@ self: {
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -75367,8 +76879,8 @@ self: {
     ({ mkDerivation, base, containers, hmatrix, random }:
      mkDerivation {
        pname = "hTensor";
-       version = "0.9.0";
-       sha256 = "0abf643e33f0cc10c652d871390e8c5b07f6e549dd0f1bb44f159d61596c0c6a";
+       version = "0.9.1";
+       sha256 = "b342d7c115af9b33a18b22b439ffc86d9141027a5ce657f6f95ee3bdf8fff523";
        libraryHaskellDepends = [ base containers hmatrix random ];
        homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
@@ -76881,8 +78393,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.0.0";
-       sha256 = "6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e";
+       version = "4.9.1.0";
+       sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77117,8 +78629,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-sass";
-       version = "0.2.1";
-       sha256 = "859f91a9fe1d0f4a0bc75c1cd49bf2246aca8d45381f9405068d8588d6533039";
+       version = "0.2.2";
+       sha256 = "14e3076b7921f37ecd0edf736be931536705461b66755387ec7813aa5e3e8302";
        libraryHaskellDepends = [
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
@@ -77128,6 +78640,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakyll-series" = callPackage
+    ({ mkDerivation, base, containers, hakyll }:
+     mkDerivation {
+       pname = "hakyll-series";
+       version = "0.1.0.1";
+       sha256 = "5dc50cd068aa082a2b5bf7d0beb6114ff1b0d7cd817b5ce0ef439798dda706b1";
+       libraryHaskellDepends = [ base containers hakyll ];
+       homepage = "https://github.com/oisdk/hakyll-series";
+       description = "Adds series functionality to hakyll";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hakyll-shakespeare" = callPackage
     ({ mkDerivation, base, blaze-html, containers, hakyll, shakespeare
      , text
@@ -79208,8 +80732,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.4.4";
-       sha256 = "7bd450caafb4220aa6e0e86bd4a03815d8a903204f2bb79fb89a60e3a6902d5c";
+       version = "0.4.5";
+       sha256 = "910043c589d093935d99d060f110482b13c76496d215de4d49a276237d8331cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79631,8 +81155,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.1.0";
-       sha256 = "fc335506a48d1479ed59eeaf5c073e682c380c61360293188d84d5c0a232e21f";
+       version = "0.2.2";
+       sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing colour data-default-class
          hashable hxt primitive split unordered-containers
@@ -80142,6 +81666,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-src-exts_1_19_0" = callPackage
+    ({ mkDerivation, array, base, containers, cpphs, directory
+     , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
+     , tasty, tasty-golden, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "haskell-src-exts";
+       version = "1.19.0";
+       sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47";
+       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
+         base containers directory filepath mtl pretty-show smallcheck tasty
+         tasty-golden tasty-smallcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/haskell-suite/haskell-src-exts";
+       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-exts-prisms" = callPackage
     ({ mkDerivation, base, haskell-src-exts, lens, template-haskell }:
      mkDerivation {
@@ -80265,8 +81811,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.2.0.0";
-       sha256 = "146c5b9501b6ee3d48085531afdca768f25448771ab1f35565dd336b22e3421b";
+       version = "0.3.0.1";
+       sha256 = "5eab56307a8f415114da1c891e1753ccfe7febe8fe04c0280a8eb5b4e20c8728";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -80330,63 +81876,83 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-backend-ghc" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghc
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-backend-ghc";
+       version = "0.3.0.1";
+       sha256 = "a63cd589f21a534bd0e68f27307a791f2257ab6e8eca7c76832a26e2b17868a3";
+       libraryHaskellDepends = [
+         base bytestring containers ghc haskell-tools-ast mtl references
+         safe split template-haskell transformers uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Creating the Haskell-Tools AST from GHC's representations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, base, containers, directory, ghc, ghc-paths
-     , haskell-tools-ast, haskell-tools-prettyprint
-     , haskell-tools-refactor, mtl, references, split
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
+     , haskell-tools-refactor, HUnit, mtl, references, split
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.2.0.0";
-       sha256 = "fb59c74aae296cf598e7dd19634aa57037966e4a3cace373ed6abd449229f44d";
-       isLibrary = false;
+       version = "0.3.0.1";
+       sha256 = "0e60a276383fff8b9cceda6fe82d45001156db5d3888b1914b16b04280f697b2";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          base containers directory ghc ghc-paths haskell-tools-ast
          haskell-tools-prettyprint haskell-tools-refactor mtl references
          split
        ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory filepath HUnit ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-ast-fromghc, haskell-tools-ast-trf
-     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
-     , mtl, references, transformers, wai, wai-websockets, warp
-     , websockets
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, http-types, mtl, references, transformers
+     , wai, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.2.0.0";
-       sha256 = "2c70c5dc92fd4ce296a6035a7a4d2471cbc372a4dcf5735590082cbd9e926dd4";
+       version = "0.3.0.1";
+       sha256 = "9c85cd53b3cb18a1f6355b1d7f9c9f702ad82cead9f6b2e2d20d4ff1de5ca744";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-trf
+         haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-refactor http-types mtl
          references transformers wai wai-websockets warp websockets
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast
-     , haskell-tools-ast-trf, mtl, references, split
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
+     , references, split, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.2.0.0";
-       sha256 = "ae846bb46ae3c42de8393eb1341b66d654f3a672f3ec7fc0bac3c24d0dbdd76e";
+       version = "0.3.0.1";
+       sha256 = "13356a19d14a0d0c6a95b0ec56600fd4166dcee23ddef80fe0913b5d734ade5c";
        libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl
-         references split
+         base containers ghc haskell-tools-ast mtl references split uniplate
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
@@ -80397,26 +81963,26 @@ self: {
   "haskell-tools-refactor" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-ast-fromghc, haskell-tools-ast-gen
-     , haskell-tools-ast-trf, haskell-tools-prettyprint, HUnit, mtl
-     , polyparse, references, split, template-haskell, time
-     , transformers, uniplate
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-rewrite, HUnit, mtl, old-time, polyparse
+     , references, split, template-haskell, time, transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.2.0.0";
-       sha256 = "1572b88c516512d5d5cb2c94f25ef90cc17dac8db121f374551f4eabc9979723";
+       version = "0.3.0.1";
+       sha256 = "0fc7d41b05d130f57681f90a571ad9e112186a3fe5395c6ecc4575814aa8b2f5";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen
-         haskell-tools-ast-trf haskell-tools-prettyprint mtl references
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl references
          split template-haskell transformers uniplate
        ];
        testHaskellDepends = [
          base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen
-         haskell-tools-ast-trf haskell-tools-prettyprint HUnit mtl polyparse
-         references split template-haskell time transformers uniplate
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite HUnit mtl old-time
+         polyparse references split template-haskell time transformers
+         uniplate
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
@@ -80424,6 +81990,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-rewrite" = callPackage
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast
+     , haskell-tools-prettyprint, mtl, references
+     }:
+     mkDerivation {
+       pname = "haskell-tools-rewrite";
+       version = "0.3.0.1";
+       sha256 = "190e3aaa5a2a77e4106dd7ae243605b5036b82848197d0ab747c91b89a6b3aa6";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
+         references
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Facilities for generating new parts of the Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-tor" = callPackage
     ({ mkDerivation, array, asn1-encoding, asn1-types, async
      , attoparsec, base, base64-bytestring, binary, bytestring, cereal
@@ -82004,8 +83587,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasty-hamiltonian";
-       version = "1.1.3";
-       sha256 = "15fe3075dc4cf9a5ea9875cb15da469ee414223696c0e9eb3163a44d23c38463";
+       version = "1.1.4";
+       sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed";
        libraryHaskellDepends = [
          base lens mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -84329,6 +85912,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "XML parser/formatter based on expat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-iteratee" = callPackage
@@ -84382,6 +85966,7 @@ self: {
        homepage = "http://code.haskell.org/hexpat-pickle/";
        description = "XML picklers based on hexpat, source-code-similar to those of the HXT package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-pickle-generic" = callPackage
@@ -84411,6 +85996,7 @@ self: {
        libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpr" = callPackage
@@ -86355,44 +87941,6 @@ self: {
      }) {};
 
   "hledger" = callPackage
-    ({ mkDerivation, base, base-compat, cmdargs, containers, csv
-     , directory, filepath, haskeline, hledger-lib, HUnit, mtl
-     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
-     , safe, shakespeare, split, tabular, terminfo, test-framework
-     , test-framework-hunit, text, time, unordered-containers
-     , utf8-string, wizards
-     }:
-     mkDerivation {
-       pname = "hledger";
-       version = "0.27.1";
-       sha256 = "f85b8d7ea7a2c7ef1ba1fa4645df951a7bf2f83e4117fdc34d9dacfa7d17376e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat cmdargs containers csv directory filepath
-         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
-         pretty-show process regex-tdfa safe shakespeare split tabular
-         terminfo text time unordered-containers utf8-string wizards
-       ];
-       executableHaskellDepends = [
-         base base-compat cmdargs containers csv directory filepath
-         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
-         pretty-show process regex-tdfa safe shakespeare split tabular
-         terminfo text time unordered-containers utf8-string wizards
-       ];
-       testHaskellDepends = [
-         base base-compat cmdargs containers csv directory filepath
-         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
-         pretty-show process regex-tdfa safe shakespeare split tabular
-         terminfo test-framework test-framework-hunit text time
-         unordered-containers utf8-string wizards
-       ];
-       homepage = "http://hledger.org";
-       description = "Command-line interface for the hledger accounting tool";
-       license = "GPL";
-     }) {};
-
-  "hledger_1_0_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
      , csv, data-default, directory, file-embed, filepath, hashable
      , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat
@@ -86432,7 +87980,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-api" = callPackage
@@ -86474,7 +88021,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-diff" = callPackage
@@ -86493,23 +88039,6 @@ self: {
      }) {};
 
   "hledger-interest" = callPackage
-    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, time }:
-     mkDerivation {
-       pname = "hledger-interest";
-       version = "1.4.4";
-       sha256 = "d6ad4a75d810d64c9f70a19ff2b51fe37d79313c4bb1b78d95e5ddcc5998769a";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal Decimal hledger-lib mtl time
-       ];
-       homepage = "http://github.com/peti/hledger-interest";
-       description = "computes interest for a given account";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hledger-interest_1_5" = callPackage
     ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
      }:
      mkDerivation {
@@ -86524,7 +88053,6 @@ self: {
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -86546,34 +88074,6 @@ self: {
      }) {};
 
   "hledger-lib" = callPackage
-    ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
-     , cmdargs, containers, csv, Decimal, deepseq, directory, filepath
-     , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa
-     , safe, split, test-framework, test-framework-hunit, time
-     , transformers, uglymemo, utf8-string
-     }:
-     mkDerivation {
-       pname = "hledger-lib";
-       version = "0.27.1";
-       sha256 = "de9780b2d5a88d1f9518bb02bfda27cc55352f5f0b7f43770906a43e0601465f";
-       libraryHaskellDepends = [
-         array base base-compat blaze-markup bytestring cmdargs containers
-         csv Decimal deepseq directory filepath HUnit mtl mtl-compat
-         old-time parsec pretty-show regex-tdfa safe split time transformers
-         uglymemo utf8-string
-       ];
-       testHaskellDepends = [
-         array base base-compat blaze-markup bytestring cmdargs containers
-         csv Decimal deepseq directory filepath HUnit mtl mtl-compat
-         old-time parsec pretty-show regex-tdfa safe split test-framework
-         test-framework-hunit time transformers uglymemo utf8-string
-       ];
-       homepage = "http://hledger.org";
-       description = "Core data types, parsers and functionality for the hledger accounting tools";
-       license = "GPL";
-     }) {};
-
-  "hledger-lib_1_0_1" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, data-default, Decimal, deepseq
      , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl
@@ -86601,7 +88101,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-ui" = callPackage
@@ -86612,8 +88111,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.0.2";
-       sha256 = "0a1ec9ecb14bfe6726cc7d27a8adf1f4ea198362423a024402975f79f30e2b2c";
+       version = "1.0.4";
+       sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86625,7 +88124,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-vty" = callPackage
@@ -86644,7 +88142,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-web" = callPackage
@@ -86689,7 +88186,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Web interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlibBladeRF" = callPackage
@@ -86933,6 +88429,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
+  "hmatrix_0_18_0_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , openblasCompat, random, split, storable-complex, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix";
+       version = "0.18.0.0";
+       sha256 = "35766dfb4af7227a881ef1c8b740a9b5c09253f21e23ae295a5341511a913cfe";
+       configureFlags = [ "-fopenblas" ];
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq random split storable-complex
+         vector
+       ];
+       librarySystemDepends = [ openblasCompat ];
+       preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'";
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Numeric Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openblasCompat;};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -86963,8 +88480,8 @@ self: {
     ({ mkDerivation, base, containers, glpk, hmatrix }:
      mkDerivation {
        pname = "hmatrix-glpk";
-       version = "0.5.0.0";
-       sha256 = "ca90e4f1b8e95547ad70bf16c4334504ec2d5d446dad8b0fd0d4929e4ccbc551";
+       version = "0.6.0.0";
+       sha256 = "c1ca26cf362f5255dc9d399615c683f1fd7de9154f3202468edf6c9c4184af74";
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
        homepage = "https://github.com/albertoruiz/hmatrix";
@@ -86988,6 +88505,23 @@ self: {
        license = "GPL";
      }) {inherit (pkgs) gsl;};
 
+  "hmatrix-gsl_0_18_0_1" = callPackage
+    ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix-gsl";
+       version = "0.18.0.1";
+       sha256 = "fda5c3b067bb2e47fac80995c0722bdbdf9f9320ea8a04fc2eca30f3fea9d455";
+       libraryHaskellDepends = [
+         array base hmatrix process random vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Numerical computation";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl;};
+
   "hmatrix-gsl-stats" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
      , vector
@@ -87070,6 +88604,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-special_0_4_0_1" = callPackage
+    ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
+     mkDerivation {
+       pname = "hmatrix-special";
+       version = "0.4.0.1";
+       sha256 = "72a9c9c559da6b6314e6042ddfd53d638fdf1b819978a630fc339e0859c3ec4e";
+       libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Interface to GSL special functions";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-static" = callPackage
     ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec
      , template-haskell, tfp
@@ -87118,15 +88665,15 @@ self: {
      }) {};
 
   "hmatrix-tests" = callPackage
-    ({ mkDerivation, base, deepseq, hmatrix, hmatrix-gsl, HUnit
+    ({ mkDerivation, base, binary, deepseq, hmatrix, hmatrix-gsl, HUnit
      , QuickCheck, random
      }:
      mkDerivation {
        pname = "hmatrix-tests";
-       version = "0.5.0.0";
-       sha256 = "a47819899e6eb7844ad6b863dece79d347cf897cb313f59ee62bbeb608661634";
+       version = "0.6.0.0";
+       sha256 = "30a61b749705b0291ffe03514545ecf24989554f6a4632b5a73f72daade1c4d7";
        libraryHaskellDepends = [
-         base deepseq hmatrix hmatrix-gsl HUnit QuickCheck random
+         base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
        testHaskellDepends = [ base HUnit QuickCheck random ];
        homepage = "https://github.com/albertoruiz/hmatrix";
@@ -88208,74 +89755,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoogle_4_2_43" = callPackage
-    ({ mkDerivation, aeson, array, base, binary, blaze-builder
-     , bytestring, Cabal, case-insensitive, cmdargs, conduit, containers
-     , deepseq, directory, filepath, haskell-src-exts, http-types
-     , old-locale, parsec, process, QuickCheck, random, resourcet, safe
-     , shake, tagsoup, temporary, text, time, transformers, uniplate
-     , unix, vector, vector-algorithms, wai, warp
-     }:
-     mkDerivation {
-       pname = "hoogle";
-       version = "4.2.43";
-       sha256 = "eb30df565d363cd5d98821c51b0daf93493dec3bfe95c016922c95a20efa7c17";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary blaze-builder bytestring case-insensitive conduit
-         containers deepseq directory filepath haskell-src-exts http-types
-         parsec process QuickCheck random resourcet safe text transformers
-         uniplate unix vector vector-algorithms wai
-       ];
-       executableHaskellDepends = [
-         aeson array base binary blaze-builder bytestring Cabal
-         case-insensitive cmdargs conduit containers deepseq directory
-         filepath haskell-src-exts http-types old-locale parsec process
-         QuickCheck random resourcet safe shake tagsoup text time
-         transformers uniplate unix vector vector-algorithms wai warp
-       ];
-       testHaskellDepends = [ base directory filepath process temporary ];
-       testTarget = "--test-option=--no-net";
-       homepage = "http://www.haskell.org/hoogle/";
-       description = "Haskell API Search";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hoogle" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
-     , conduit-extra, connection, containers, deepseq, directory, extra
-     , filepath, haskell-src-exts, http-conduit, http-types, js-flot
-     , js-jquery, mmap, network, network-uri, network-uri-flag
-     , old-locale, process, QuickCheck, resourcet, tar, template-haskell
-     , text, time, transformers, uniplate, utf8-string, vector, wai
-     , wai-logger, warp, warp-tls, zlib
-     }:
-     mkDerivation {
-       pname = "hoogle";
-       version = "5.0.1";
-       sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e";
-       revision = "1";
-       editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring cmdargs conduit conduit-extra
-         connection containers deepseq directory extra filepath
-         haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri network-uri-flag old-locale process QuickCheck
-         resourcet tar template-haskell text time transformers uniplate
-         utf8-string vector wai wai-logger warp warp-tls zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testTarget = "--test-option=--no-net";
-       homepage = "http://hoogle.haskell.org/";
-       description = "Haskell API Search";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoogle_5_0_4" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
      , conduit-extra, connection, containers, deepseq, directory, extra
      , filepath, haskell-src-exts, http-conduit, http-types, js-flot
@@ -88303,7 +89783,6 @@ self: {
        homepage = "http://hoogle.haskell.org/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoogle-index" = callPackage
@@ -88470,6 +89949,7 @@ self: {
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -89293,37 +90773,6 @@ self: {
      }) {};
 
   "hpio" = callPackage
-    ({ mkDerivation, async, base, base-compat, bytestring, containers
-     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
-     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
-     , transformers-compat, unix, unix-bytestring
-     }:
-     mkDerivation {
-       pname = "hpio";
-       version = "0.8.0.3";
-       sha256 = "699fc04179a479e2b1560122166c6687cd7214d2fa7376c14210465625657974";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring containers directory exceptions
-         filepath mtl mtl-compat QuickCheck text transformers
-         transformers-compat unix unix-bytestring
-       ];
-       executableHaskellDepends = [
-         async base base-compat exceptions mtl mtl-compat
-         optparse-applicative transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         async base base-compat bytestring containers directory doctest
-         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
-         transformers transformers-compat unix unix-bytestring
-       ];
-       homepage = "https://github.com/dhess/hpio";
-       description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hpio_0_8_0_4" = callPackage
     ({ mkDerivation, async, base, base-compat, bytestring, containers
      , directory, doctest, exceptions, filepath, hlint, hspec, mtl
      , mtl-compat, optparse-applicative, QuickCheck, text, transformers
@@ -89352,7 +90801,6 @@ self: {
        homepage = "https://github.com/dhess/hpio";
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplayground" = callPackage
@@ -92002,16 +93450,17 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.2.3";
-       sha256 = "511e994ee86d85c610bf20a3eb8309e79816e984dc46f4d0f95bd7dc676f6210";
+       version = "2.2.4";
+       sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1";
        revision = "1";
-       editedCabalFile = "8e446bc3a3332ce9d5dc255a32682b735c8352b187e71f228f529e2fa79e6473";
+       editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
        ];
        testHaskellDepends = [
-         base directory hspec-core hspec-meta stringbuilder
+         base directory hspec-core hspec-discover hspec-expectations
+         hspec-meta HUnit QuickCheck stringbuilder transformers
        ];
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
@@ -92094,10 +93543,10 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.2.3";
-       sha256 = "01fa6959921ae0ed3de5e3f612451fe788800f9670c7f425a241f5f0dec99652";
+       version = "2.2.4";
+       sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475";
        revision = "1";
-       editedCabalFile = "9ff10012fa0457540d12846b875dd747a73a65aa8ba08876c473f42b7ac27c07";
+       editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3";
        libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -92142,8 +93591,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.2.3";
-       sha256 = "dc6053d7ad628a133fab01f11ad6d7dfecd23873e2bbe9419d30ee0318b5a92f";
+       version = "2.2.4";
+       sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -92215,15 +93664,12 @@ self: {
      }) {};
 
   "hspec-expectations-lifted" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, transformers }:
+    ({ mkDerivation, base, hspec-expectations, transformers }:
      mkDerivation {
        pname = "hspec-expectations-lifted";
-       version = "0.5.0";
-       sha256 = "0b5511f1e4728f3b7b0eba53812319959009ab1277d14eede50f73d9f9eb6e30";
-       revision = "1";
-       editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208";
+       version = "0.8.2";
+       sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef";
        libraryHaskellDepends = [ base hspec-expectations transformers ];
-       testHaskellDepends = [ base hspec ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93291,6 +94737,7 @@ self: {
        homepage = "http://hstox.github.io";
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstradeking" = callPackage
@@ -94742,33 +96189,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.4.3.1";
-       sha256 = "579285aa58836631f8393f733b524a8c74591ed0318632bed97d4eaa090783eb";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-reverse-proxy_0_4_3_2" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -94793,7 +96213,6 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-server" = callPackage
@@ -95069,6 +96488,7 @@ self: {
        homepage = "http://justhub.org";
        description = "For multiplexing GHC installations and providing development sandboxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hubigraph" = callPackage
@@ -95567,6 +96987,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -95657,22 +97078,6 @@ self: {
      }) {};
 
   "hw-diagnostics" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "hw-diagnostics";
-       version = "0.0.0.4";
-       sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hw-diagnostics_0_0_0_5" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "hw-diagnostics";
@@ -95682,7 +97087,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
        description = "Diagnostics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-eliasfano" = callPackage
@@ -95702,6 +97106,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-eliasfano#readme";
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-excess" = callPackage
@@ -95721,6 +97126,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-excess#readme";
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-int" = callPackage
@@ -95800,6 +97206,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-json-lens#readme";
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-mquery" = callPackage
@@ -95835,6 +97242,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-packed-vector#readme";
        description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-parser" = callPackage
@@ -95944,6 +97352,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -96047,6 +97456,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -96347,6 +97757,7 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-extras" = callPackage
@@ -96842,8 +98253,8 @@ self: {
      }:
      mkDerivation {
        pname = "hylide";
-       version = "0.1.4.1";
-       sha256 = "e0c98883073da1513757698c2c70cee419db20e351127e83c31e01239c66a94e";
+       version = "0.1.5.1";
+       sha256 = "160e2d915caa220b410f5e1ccbbaaa215c6cf1390a51ff2b1d27bccceb82df67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hylogen vector-space ];
@@ -96851,8 +98262,8 @@ self: {
          aeson base bytestring filepath fsnotify hint http-types hylogen
          process text wai warp websockets
        ];
-       homepage = "https://github.com/sleexyz/hylide";
-       description = "WebGL renderer for livecoding shaders with Hylogen";
+       homepage = "https://github.com/sleexyz/hylogen";
+       description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -96860,11 +98271,11 @@ self: {
     ({ mkDerivation, base, data-reify, vector-space }:
      mkDerivation {
        pname = "hylogen";
-       version = "0.1.4.1";
-       sha256 = "dc78062033fd5f6c4c4f1faed5229fe79a249f063c50d826dbd3b5af5ebfc4d3";
+       version = "0.1.5.1";
+       sha256 = "3d07172627f22cfba684d15fcbf27079b5542a049734f67fbf1c7b5c8f5d4941";
        libraryHaskellDepends = [ base data-reify vector-space ];
        homepage = "https://github.com/sleexyz/hylogen";
-       description = "Purely functional GLSL embedded in Haskell";
+       description = "GLSL embedded in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -96881,6 +98292,7 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylotab" = callPackage
@@ -99786,29 +101198,6 @@ self: {
      }) {};
 
   "intero" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec
-     , process, regex-compat, syb, temporary, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "intero";
-       version = "0.1.18";
-       sha256 = "7e546a35df019149e38bf2a33cd977c2143e650b45a3c7835a42fd1c7099c570";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array base bytestring containers directory filepath ghc ghc-boot-th
-         ghc-paths ghci haskeline process syb time transformers unix
-       ];
-       testHaskellDepends = [
-         base directory hspec process regex-compat temporary transformers
-       ];
-       homepage = "https://github.com/commercialhaskell/intero";
-       description = "Complete interactive development program for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "intero_0_1_19" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec
      , process, regex-compat, syb, temporary, time, transformers, unix
@@ -99829,7 +101218,6 @@ self: {
        homepage = "https://github.com/commercialhaskell/intero";
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpol" = callPackage
@@ -100394,13 +101782,13 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.8.6";
-       sha256 = "e8e53531f7165234845a58f2a6b893dbf0bbb75ac3f08870005f9c3fd67c4d6b";
+       version = "0.8.7";
+       sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
        testHaskellDepends = [
-         base bytestring doctest HUnit QuickCheck test-framework
+         attoparsec base bytestring doctest HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/andrewthad/haskell-ip#readme";
@@ -100434,6 +101822,7 @@ self: {
        homepage = "http://www.ip2location.com";
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip6addr" = callPackage
@@ -100645,25 +102034,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
-     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
-     , time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "0.4.4.0";
-       sha256 = "b5299e0b5d47f32828b5bb0a23a872105f6c778b8a6c15cf4ce8a7691c69ab3a";
-       libraryHaskellDepends = [
-         base bytestring conduit connection irc-conduit irc-ctcp
-         network-conduit-tls old-locale stm stm-conduit text time tls
-         transformers x509 x509-store x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-client";
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_0_4_4_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
      , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
      , time, tls, transformers, x509, x509-store, x509-validation
@@ -100680,7 +102050,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -100695,24 +102064,6 @@ self: {
      }) {};
 
   "irc-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
-     , transformers, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-conduit";
-       version = "0.2.1.0";
-       sha256 = "c363a8096e15459c379cfb73e025c1102b4c6e367716c1408216977401b6445c";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra connection irc irc-ctcp
-         network-conduit-tls text time tls transformers x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-conduit";
-       description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-conduit_0_2_1_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
      , transformers, x509-validation
@@ -100728,7 +102079,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-core" = callPackage
@@ -101397,16 +102747,14 @@ self: {
      }:
      mkDerivation {
        pname = "ivory";
-       version = "0.1.0.3";
-       sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6";
-       revision = "1";
-       editedCabalFile = "2149b10ef5f9149f362f51960ddd252205c4ee348869741e70d3a33892fe66be";
+       version = "0.1.0.4";
+       sha256 = "96a056e1f3d766223d93dcd3aaedd6619aa1806f31903c3f46e30a058705583f";
        libraryHaskellDepends = [
          array base base-compat containers dlist filepath monadLib pretty
          template-haskell text th-lift
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101418,8 +102766,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-artifact";
-       version = "0.1.0.3";
-       sha256 = "375a287288e9886bc9055c128e0d2d4cddab985baf8e52a82176c323b98f401e";
+       version = "0.1.0.4";
+       sha256 = "a2aa0b21fa58c5f87d5001f74fcbfda439a6dbfb56577214447c75f3b204ce8c";
        libraryHaskellDepends = [
          base directory filepath HStringTemplate text utf8-string
        ];
@@ -101436,14 +102784,14 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.3";
-       sha256 = "44e43e14e1951c4703c99bf116d6951eff575124d92f58dd7450f19ec14aa33e";
+       version = "0.1.0.4";
+       sha256 = "1515d217549af8189b83a5963ddfd6d202b58cdb9f98644a41988e7b67884caf";
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
          ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
          process srcloc template-haskell
        ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101475,15 +102823,15 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-eval";
-       version = "0.1.0.3";
-       sha256 = "94acbed559f5567d291f95fb3ce70e9487cbf31bfc4721030017bbc5f078b958";
+       version = "0.1.0.4";
+       sha256 = "dd4f92558eea73265d680963bfad48112c782ed144726ee001f547216368e020";
        libraryHaskellDepends = [
          base base-compat containers ivory monadLib
        ];
        testHaskellDepends = [
          base base-compat containers ivory monadLib tasty tasty-hunit
        ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101496,31 +102844,29 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-examples";
-       version = "0.1.0.3.1";
-       sha256 = "f73720e850410a0d3ab4acfc6fe478c2d475f9e2e12c6782ec9f8a1236690f82";
+       version = "0.1.0.4";
+       sha256 = "d61091b079166b06537feb0a719d7e4e09718732df3f1f264167af800f72900a";
+       revision = "2";
+       editedCabalFile = "7b0f9b186a1356c9210ecfe4ae198b1fa3056f1c78188126b83fbd39c09e253f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib
          monadLib pretty QuickCheck template-haskell
        ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org/";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
-    ({ mkDerivation, base, filepath, ivory, ivory-artifact
-     , ivory-backend-c
-     }:
+    ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-hw";
-       version = "0.1.0.3";
-       sha256 = "0dec96122661a8f281daf7e52f8e7dcc80481090518115a8c6e0859d919f64b2";
-       libraryHaskellDepends = [
-         base filepath ivory ivory-artifact ivory-backend-c
-       ];
+       version = "0.1.0.4";
+       sha256 = "d441e06d61ffaada4719d6b274d090308accba9e71f49bd3d31be608f26193dc";
+       libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
@@ -101533,8 +102879,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-opts";
-       version = "0.1.0.3";
-       sha256 = "caaf34f5b38ec88fe422cc367f28ab8b98b1a3b131dadaffcd8000b438562eb3";
+       version = "0.1.0.4";
+       sha256 = "14c1337cdd8f4a06ff6e99e050fb5d9bd98ec221c77de510368cb8aa4f7b7019";
        libraryHaskellDepends = [
          base base-compat containers data-reify dlist fgl filepath ivory
          monadLib pretty
@@ -101552,8 +102898,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-quickcheck";
-       version = "0.2.0.3";
-       sha256 = "ca005a77265d6140cabe7796062d145ae8be185123db1095c957aee76aec56f4";
+       version = "0.2.0.4";
+       sha256 = "c7c3e1dcf2c3bbf21612445155f1e869576e5dcd9099b7d4eea0694b327d63a5";
        libraryHaskellDepends = [
          base base-compat ivory ivory-backend-c ivory-eval monadLib
          QuickCheck random
@@ -101574,8 +102920,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-serialize";
-       version = "0.1.0.3";
-       sha256 = "bb07a4218c8e6d314ee5aa0bdf75891a9f9b7a106020f4bb439bfe26053610eb";
+       version = "0.1.0.4";
+       sha256 = "bf73dccdcac406b7adc8981e01d9b363df6411ce7e7bb70daf2f6065f17abc12";
        libraryHaskellDepends = [
          base base-compat filepath ivory ivory-artifact monadLib
        ];
@@ -101588,10 +102934,10 @@ self: {
     ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-stdlib";
-       version = "0.1.0.3";
-       sha256 = "0ff865b14e046a9caffd1ac79e256568bd3bf60aa648e673582d7009bdcc635c";
+       version = "0.1.0.4";
+       sha256 = "912b78ed7b5143ff54517f3c483dd73dab9401cfce2c0a4f43fcdc9ca7413c5b";
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101874,8 +103220,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5.1";
-       sha256 = "b3a5069b8725f7ace65f2e921d0451f42996bd6e198d38e32ef948b44ec90349";
+       version = "0.5.2";
+       sha256 = "cf7b09b08144d7cdc35111a07a1374b08b099a4d639da12bcad9502a830bcebc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102208,6 +103554,7 @@ self: {
        homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {jvm = null;};
 
   "jobqueue" = callPackage
@@ -103346,6 +104693,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
+  "juicy-gcode" = callPackage
+    ({ mkDerivation, base, configurator, lens, linear, matrix
+     , optparse-applicative, svg-tree, text
+     }:
+     mkDerivation {
+       pname = "juicy-gcode";
+       version = "0.1.0.1";
+       sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base configurator lens linear matrix optparse-applicative svg-tree
+         text
+       ];
+       homepage = "https://github.com/domoszlai/juicy-gcode";
+       description = "SVG to G-Code converter";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jukebox" = callPackage
     ({ mkDerivation, alex, array, base, containers, directory, dlist
      , filepath, minisat, pretty, process, symbol, transformers
@@ -103438,6 +104805,7 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-parser" = callPackage
@@ -103724,25 +105092,26 @@ self: {
     ({ mkDerivation, aeson, auto-update, base, bytestring, containers
      , directory, either, exceptions, hostname, microlens, microlens-th
      , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa
-     , resourcet, semigroups, string-conv, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, text, time
-     , time-locale-compat, transformers, transformers-base
+     , resourcet, semigroups, string-conv, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
+     , time, time-locale-compat, transformers, transformers-base
      , transformers-compat, unix, unordered-containers
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.3.0.0";
-       sha256 = "6e828cdeaff7e569f19b5b40c8409cf549d53556341e7064272ee1a7a3ab907e";
+       version = "0.3.1.0";
+       sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3";
        libraryHaskellDepends = [
          aeson auto-update base bytestring containers either exceptions
          hostname microlens microlens-th monad-control mtl old-locale
          resourcet semigroups string-conv template-haskell text time
-         time-locale-compat transformers transformers-base
-         transformers-compat unix unordered-containers
+         transformers transformers-base transformers-compat unix
+         unordered-containers
        ];
        testHaskellDepends = [
-         aeson base directory quickcheck-instances regex-tdfa tasty
-         tasty-hunit tasty-quickcheck template-haskell temporary text time
+         aeson base bytestring directory microlens quickcheck-instances
+         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell temporary text time time-locale-compat
          unordered-containers
        ];
        homepage = "https://github.com/Soostone/katip";
@@ -106029,8 +107398,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-inline";
-       version = "0.7.9.2";
-       sha256 = "da975b3d40de997e4f21a47867894aa0208e8581015bed70b903fe199eb1f62d";
+       version = "0.7.10.0";
+       sha256 = "d1d882c8312bcbc37869b96a5c5a16733db9c917566f11a18a4799fcc6814b94";
        libraryHaskellDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
@@ -106126,31 +107495,6 @@ self: {
      }) {};
 
   "language-dockerfile" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
-     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , ShellCheck, split, template-haskell, test-framework
-     , test-framework-hunit, th-lift, th-lift-instances, transformers
-     }:
-     mkDerivation {
-       pname = "language-dockerfile";
-       version = "0.3.4.0";
-       sha256 = "94e6996d5e56b6fb73f967e09d47d1aa2dc5a8e31ce991f27b49f28a3d8953d0";
-       libraryHaskellDepends = [
-         base bytestring free mtl parsec pretty ShellCheck split
-         template-haskell th-lift th-lift-instances transformers
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath free Glob hspec HUnit mtl parsec
-         pretty process QuickCheck ShellCheck split template-haskell
-         test-framework test-framework-hunit th-lift th-lift-instances
-         transformers
-       ];
-       homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
-       description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-dockerfile_0_3_5_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
      , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
      , ShellCheck, split, template-haskell, test-framework
@@ -106173,7 +107517,6 @@ self: {
        homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dot" = callPackage
@@ -107555,8 +108898,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.6.0.0";
-       sha256 = "dab609f13594fd58d78ac5775d9e1027247d17ef5a29ca319140afa2f05f49d2";
+       version = "0.7.0.0";
+       sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
          canteven-http canteven-log conduit conduit-extra containers
@@ -107594,6 +108937,7 @@ self: {
        homepage = "https://github.com/owensmurray/legion-discovery#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "legion-discovery-client" = callPackage
@@ -107621,8 +108965,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.4";
-       sha256 = "6961f3d40eac0bef0a6aa9301e6057ee79bf92ccec82cd6f60957b759dc1c048";
+       version = "0.1.0.5";
+       sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6";
        libraryHaskellDepends = [
          aeson base bytestring canteven-log containers data-default-class
          legion network safe split yaml
@@ -108029,6 +109373,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lens-xml" = callPackage
+    ({ mkDerivation, base, lens, xml }:
+     mkDerivation {
+       pname = "lens-xml";
+       version = "0.1.0.0";
+       sha256 = "21ef72a6579a56528fd158aa9594e50257224cf77dcc303a5fd153a2097a1ba8";
+       revision = "1";
+       editedCabalFile = "5e9b888e270e22fee6210c9a6f329e31e80d4c0a54d064ef29ef969bc443b21d";
+       libraryHaskellDepends = [ base lens xml ];
+       testHaskellDepends = [ base lens xml ];
+       homepage = "https://github.com/nkpart/lens-xml#readme";
+       description = "Lenses for the xml package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lenses" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -108878,8 +110237,8 @@ self: {
      }:
      mkDerivation {
        pname = "libsystemd-journal";
-       version = "1.4.0";
-       sha256 = "31b20c903a6662eb2bbcf9aa2998936bc216e0711587134325bbe12fb615efd2";
+       version = "1.4.1";
+       sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b";
        libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
@@ -109198,16 +110557,15 @@ self: {
      }:
      mkDerivation {
        pname = "lightning-haskell";
-       version = "0.1.0.2";
-       sha256 = "f6616270f8a15bc6a1efb5fe3431f97112c6c2a144c0f90f88e9df6a931b04d7";
+       version = "0.1.0.3";
+       sha256 = "1930569f4d52ead5c72f3a8beeb9c9ba3cc805cb7d89832ffbcae997ead275c0";
        libraryHaskellDepends = [
          aeson api-builder base blaze-html bytestring data-default-class
          free http-client http-client-tls http-types mtl network text
          transformers
        ];
        testHaskellDepends = [
-         aeson api-builder base bytestring hspec http-client http-client-tls
-         http-types network text transformers
+         aeson api-builder base bytestring hspec text transformers
        ];
        homepage = "https://github.com/cmoresid/lightning-haskell#readme";
        description = "Haskell client for lightning-viz REST API";
@@ -112129,8 +113487,8 @@ self: {
      }:
      mkDerivation {
        pname = "lua-bc";
-       version = "0.1.0.1";
-       sha256 = "c0f92db8b4c0bdc2d188c1f17833fb684489ab3147837e68bffa96375c7fa89a";
+       version = "0.1.0.2";
+       sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 pretty text
          vector
@@ -113665,7 +115023,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55";
        revision = "1";
-       editedCabalFile = "1e17d3b0d97cd033dd95b227ab387d6c3118a9b3191a290a593542f2ef0c4698";
+       editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -113990,6 +115348,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "marvin" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, classy-prelude
+     , configurator, directory, filepath, hslogger, lens, mtl, mustache
+     , network-uri, optparse-generic, random, template-haskell
+     , text-format, text-icu, vector, websockets, wreq, wuss
+     }:
+     mkDerivation {
+       pname = "marvin";
+       version = "0.0.1";
+       sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring classy-prelude configurator hslogger
+         lens mtl network-uri optparse-generic random template-haskell
+         text-format text-icu vector websockets wreq wuss
+       ];
+       executableHaskellDepends = [
+         base classy-prelude directory filepath mustache optparse-generic
+       ];
+       homepage = "https://github.com/JustusAdam/marvin#readme";
+       description = "A modular bot for slack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, cubicbezier
      , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens
@@ -114132,6 +115516,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mathexpr" = callPackage
+    ({ mkDerivation, base, data-default-class }:
+     mkDerivation {
+       pname = "mathexpr";
+       version = "0.3.0.0";
+       sha256 = "23c30ae0c962a7858d57bed320be6421baeb82fa795260e1eea0bc8fcc4871ad";
+       libraryHaskellDepends = [ base data-default-class ];
+       homepage = "https://github.com/mdibaiee/mathexpr";
+       description = "Parse and evaluate math expressions with variables and functions";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "mathgenealogy" = callPackage
     ({ mkDerivation, base, binary, bytestring, cmdargs, containers
      , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup
@@ -114482,8 +115878,8 @@ self: {
     ({ mkDerivation, base, containers, mwc-probability, transformers }:
      mkDerivation {
        pname = "mcmc-types";
-       version = "1.0.1";
-       sha256 = "04e11474719161813da8ce505a7052853a26a237d5ddee99ed198a3326b246e0";
+       version = "1.0.2";
+       sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3";
        libraryHaskellDepends = [
          base containers mwc-probability transformers
        ];
@@ -114919,8 +116315,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.2.0.0";
-       sha256 = "348f9f78616185655b96b281a9436522a711349fc51c093dd6fc6a41bfdde3cf";
+       version = "0.2.0.1";
+       sha256 = "0f77d99f49158ed2e715d52dc25260fb9fffe094300900cf0234745b02f7d85c";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-default-class hashable
          network resource-pool time vector
@@ -115901,8 +117297,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighty-metropolis";
-       version = "1.0.2";
-       sha256 = "639c560cdb6d4f1d793cf9baf02dca60ca290a6d1831e463f6c92458bd83c0f2";
+       version = "1.0.3";
+       sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80";
        libraryHaskellDepends = [
          base mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -116651,8 +118047,8 @@ self: {
      }:
      mkDerivation {
        pname = "mockery";
-       version = "0.3.3";
-       sha256 = "61157a39a3123001e0b8c7714e171980e879d01bf43f7b171e393ecab6c0fad4";
+       version = "0.3.4";
+       sha256 = "30fe35f4f9cfd1b85a4ccc514a25ef066148364886e53538d50e5e760a582938";
        libraryHaskellDepends = [
          base base-compat bytestring directory filepath logging-facade
          temporary
@@ -116931,8 +118327,8 @@ self: {
      }:
      mkDerivation {
        pname = "mole";
-       version = "0.0.3";
-       sha256 = "dd9dd149f4c5ce0e9e9bec0c75277b9a4fad51ff6a1545f0231ba94e0b51469e";
+       version = "0.0.5";
+       sha256 = "0b0735bcd5afc88f192457a6b7dd3266d3341ec911d31a2fcd67acaf2b517893";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119499,21 +120895,20 @@ self: {
      }) {};
 
   "multifile" = callPackage
-    ({ mkDerivation, base, directory, HaXml, optparse-applicative
-     , pretty
-     }:
+    ({ mkDerivation, base, directory, HaXml, pretty, transformers }:
      mkDerivation {
        pname = "multifile";
-       version = "0.1.0.2";
-       sha256 = "acfcdc40b0ec9a11cd0de2efaa6fb1b4164907b24d3326ea78b5576ee51ac784";
+       version = "0.1.0.3";
+       sha256 = "f02f1c4fda7708c064735f7b5c5b8fec59c27522c0fce1c057c3705d9e70a322";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory HaXml optparse-applicative pretty
+         base directory HaXml pretty transformers
        ];
        homepage = "xy30.com";
        description = "create many files from one";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multifocal" = callPackage
@@ -120344,18 +121739,6 @@ self: {
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "1.2.1";
-       sha256 = "c06d839399b1bd64db11288f017badb13bea2e87afb22bd3ff1888a6171574fd";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_1_2_2" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -120365,7 +121748,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random" = callPackage
@@ -120501,8 +121883,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql";
-       version = "0.1.3";
-       sha256 = "282e9dc78d9b0f8f4e99ef7d1cd257a3a41a66a4e890bc6823dade4af6317a0d";
+       version = "0.1.4";
+       sha256 = "9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ mysql ];
@@ -121793,6 +123175,7 @@ self: {
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -121928,6 +123311,7 @@ self: {
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network" = callPackage
@@ -122404,8 +123788,8 @@ self: {
     ({ mkDerivation, base, network }:
      mkDerivation {
        pname = "network-multicast";
-       version = "0.1.2";
-       sha256 = "82dcd07dd7f62d0ba23f4b37469768f07bcf6bd888dd54ebe61603f6fd2ccefb";
+       version = "0.2.0";
+       sha256 = "0f3b50abc3a401c20cc6a0ec51a49d2a48e5b467d9fbd63b7cf803165fe975f2";
        libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
@@ -123055,8 +124439,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.2.2.0";
-       sha256 = "d9d97e8b1f7ce0dd3c183dabe9b1856e4c0594617a1da5a22e34782648deadef";
+       version = "0.2.3.1";
+       sha256 = "2c5b5a6199e6eb4e11fc25cf92663bfaed323f44d34f05991ede25429e8b322c";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -123614,6 +124998,8 @@ self: {
        pname = "normalization-insensitive";
        version = "2.0";
        sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29";
+       revision = "1";
+       editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2";
        libraryHaskellDepends = [
          base bytestring deepseq hashable text unicode-transforms
        ];
@@ -123892,6 +125278,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ntrip-client" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, basic-prelude
+     , bytestring, case-insensitive, conduit, conduit-extra, exceptions
+     , http-types, lens, lifted-async, monad-control, optparse-generic
+     , uri-bytestring
+     }:
+     mkDerivation {
+       pname = "ntrip-client";
+       version = "0.1.4";
+       sha256 = "e1c1dda1e00e2b195d0c326ccf0bc23f122c4337d68056a6fc66646ee05aec2f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring basic-prelude bytestring
+         case-insensitive conduit conduit-extra exceptions http-types lens
+         lifted-async monad-control uri-bytestring
+       ];
+       executableHaskellDepends = [
+         base basic-prelude bytestring conduit optparse-generic
+       ];
+       description = "NTRIP client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "null-canvas" = callPackage
     ({ mkDerivation, aeson, base, containers, filepath, scotty, split
      , stm, text, transformers, wai-extra, warp
@@ -124427,6 +125838,7 @@ self: {
        homepage = "https://github.com/hverr/haskell-obd#readme";
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "obdd" = callPackage
@@ -124765,8 +126177,8 @@ self: {
      }:
      mkDerivation {
        pname = "oidc-client";
-       version = "0.2.0.0";
-       sha256 = "b2d7daa84844d0cc1057bbaffc836bb52ff2992b98a17b4b285778bacdefc03c";
+       version = "0.3.0.0";
+       sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-client-tls jose-jwt network network-uri text time tls
@@ -126454,6 +127866,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "org2anki" = callPackage
+    ({ mkDerivation, base, parsec, regex-compat }:
+     mkDerivation {
+       pname = "org2anki";
+       version = "0.1.0";
+       sha256 = "389acfbf0d308073dced89c63be5b8ae21d6343970b4700abb31fa6cb6f4053b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base parsec regex-compat ];
+       homepage = "https://github.com/M42/org2anki";
+       description = "Basic org to anki exporter";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "organize-imports" = callPackage
     ({ mkDerivation, attoparsec, base, text }:
      mkDerivation {
@@ -127232,39 +128658,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.10.1.2";
-       sha256 = "be7b3776a338c4fc46565978bc8c89783e90c3853fe5bc447ddc9bf053bf5f39";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath pandoc pandoc-types
-         process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_10_2_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -127295,7 +128688,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -127535,8 +128927,8 @@ self: {
      }:
      mkDerivation {
        pname = "pango";
-       version = "0.13.3.0";
-       sha256 = "a2c44f889674add7c65326144420d68d47dcdcd511d5c251022fa7a97a60755c";
+       version = "0.13.3.1";
+       sha256 = "306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb";
        setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
@@ -128437,18 +129829,6 @@ self: {
      }) {};
 
   "partial-handler" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "partial-handler";
-       version = "1.0.1";
-       sha256 = "e54eb9814d52e384dac62b8e365fafe9fb7319b5d4325d4bd76e4c17662b26f7";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/partial-handler";
-       description = "A composable exception handler";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "partial-handler_1_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "partial-handler";
@@ -128458,7 +129838,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-isomorphisms" = callPackage
@@ -128626,8 +130005,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.3.2.0";
-       sha256 = "be251bdd996fe8bc89dfe95fb86d9abeda2cd6b6b6044a7ab79900f6c8d27e0b";
+       version = "0.3.3.0";
+       sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129591,8 +130970,8 @@ self: {
      }:
      mkDerivation {
        pname = "period";
-       version = "0.1.0.4";
-       sha256 = "f1f0d37ee4e6e31fc448e6f552105d20c3a9359f8af8780d52eeb980d313715c";
+       version = "0.1.0.5";
+       sha256 = "b66ede8f1609d026cf43b7083fe0f824cb45bea53712632958161884a68cd5f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129687,8 +131066,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.4.0.3";
-       sha256 = "0a25f3cfec301e9124293e8f38ad55fba5d18d3d7a9371a971ee17b6152ad360";
+       version = "0.4.1.0";
+       sha256 = "5bf42a49a7efa127b5f5308ed812c367d3fe1afe499f32e24d0ac0f846df7619";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell
          th-data-compat transformers
@@ -129895,8 +131274,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-iproute";
-       version = "0.2.2";
-       sha256 = "b3f9e7dd28e263230b8b5230ad450178202f544ebd01517ff21940a331e36eb1";
+       version = "0.2.3";
+       sha256 = "f595a11ceaa1c19e11d6f4fc58ec2834eb100791ae82626912115f1d79edbfaa";
        libraryHaskellDepends = [
          aeson aeson-iproute base bytestring http-api-data iproute
          path-pieces persistent text
@@ -130091,6 +131470,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistent-relational-record" = callPackage
+    ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl
+     , persistable-record, persistent, persistent-template
+     , relational-query, resourcet, template-haskell, test-framework
+     , test-framework-hunit, test-framework-th, text, time
+     }:
+     mkDerivation {
+       pname = "persistent-relational-record";
+       version = "0.1.0.0";
+       sha256 = "b2b5858bcabf3c889e9c30dbb5d12dd45f48683036e565ceebfc245e2c5a8870";
+       libraryHaskellDepends = [
+         base conduit containers mtl persistable-record persistent
+         relational-query resourcet template-haskell text
+       ];
+       testHaskellDepends = [
+         base hlint HUnit persistent-template relational-query
+         test-framework test-framework-hunit test-framework-th text time
+       ];
+       homepage = "http://github.com/himura/persistent-relational-record";
+       description = "relational-record on persisten backends";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-sqlite_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, monad-control, monad-logger, old-locale, persistent
@@ -130889,8 +132291,8 @@ self: {
     ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }:
      mkDerivation {
        pname = "picedit";
-       version = "0.1.1.0";
-       sha256 = "4219089f3375925f413111d05ce9087b1f4aca01f43d64ddd3fc2931c52d7740";
+       version = "0.1.1.1";
+       sha256 = "29cb93ae27ac980884f4a8db3896ae8e7d2b2bcf1b77d368a9ff9a3fb9a7bfcd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
@@ -131630,6 +133032,7 @@ self: {
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-io" = callPackage
@@ -132200,6 +133603,29 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "pkcs10_0_2_0_0" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, x509
+     }:
+     mkDerivation {
+       pname = "pkcs10";
+       version = "0.2.0.0";
+       sha256 = "896e923f67bac4c7f0e48c9afca60f9ef5178e00fca9f179e8fdae3c12476294";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
+         x509
+       ];
+       testHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
+         QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
+       ];
+       homepage = "https://github.com/fcomb/pkcs10-hs#readme";
+       description = "PKCS#10 library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pkcs7" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, HUnit, QuickCheck }:
      mkDerivation {
@@ -133922,8 +135348,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-bind";
-       version = "0.2.0.0";
-       sha256 = "9e9f91c1b8b41ad19ebd01416435007e847560e840f62e4d5187185d051936fb";
+       version = "0.3.0.0";
+       sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default exceptions heredoc
          postgresql-simple template-haskell text time
@@ -133932,7 +135358,7 @@ self: {
          attoparsec base bytestring case-conversion data-default hspec
          postgresql-simple text
        ];
-       description = "A FFI-like bindings for PostgreSQL stored functions";
+       description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -135090,8 +136516,8 @@ self: {
      }:
      mkDerivation {
        pname = "pringletons";
-       version = "0.3";
-       sha256 = "2d9587e66b232f66ec7821df4c5999d48883a7f06daf4a39ad1f770b92baecd7";
+       version = "0.4";
+       sha256 = "1f64cc8a021bcd9f535928e1ed2907df1f556359c28c1a3f4d61f3e1eb0e66fb";
        libraryHaskellDepends = [
          aeson base hashable singletons template-haskell text
          unordered-containers vector vinyl
@@ -135606,25 +137032,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.3.0.2";
-       sha256 = "43df79a7d3b0a9562658367a46016c361522ea07ac67fb5ad65d891ad77bfbaf";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson attoparsec base bytestring filepath text unordered-containers
-         vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_3_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
      , text, unordered-containers, vector
      }:
@@ -135641,7 +137048,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -136353,8 +137759,8 @@ self: {
      }:
      mkDerivation {
        pname = "protolude";
-       version = "0.1.8";
-       sha256 = "014d3a551d4e0929df615ff2df7e0215d67e34af8f03928e98bbaffec98860bc";
+       version = "0.1.10";
+       sha256 = "163296a518f0d7329dcdf040bf0eddb1fb804eee198405801fab8f192ce1c7a5";
        libraryHaskellDepends = [
          async base bytestring containers deepseq ghc-prim mtl safe stm text
          transformers
@@ -136613,12 +138019,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20161014" = callPackage
+  "publicsuffix_0_20161104" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20161014";
-       sha256 = "7fe7abfe8727dc20951c6c7dec35c8ca71ddc34972615f5abe24ae7d3ce99622";
+       version = "0.20161104";
+       sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -137023,6 +138429,7 @@ self: {
        homepage = "http://github.com/GaloisInc/pure-zlib";
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pureMD5" = callPackage
@@ -138257,6 +139664,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-special" = callPackage
+    ({ mkDerivation, base, bytestring, nats, QuickCheck
+     , quickcheck-instances, scientific, text
+     }:
+     mkDerivation {
+       pname = "quickcheck-special";
+       version = "0.1.0.0";
+       sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113";
+       libraryHaskellDepends = [
+         base bytestring nats QuickCheck quickcheck-instances scientific
+         text
+       ];
+       homepage = "https://github.com/minad/quickcheck-special#readme";
+       description = "Edge cases and special values for QuickCheck Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quickcheck-text" = callPackage
     ({ mkDerivation, base, binary, bytestring, QuickCheck, text }:
      mkDerivation {
@@ -139501,8 +140925,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "0.1.0";
-       sha256 = "4a2b0ca12153d467d09c623a09a497028346f8838cbb0ce45c333f812539cfe9";
+       version = "0.1.6";
+       sha256 = "a1578ce6b94f5b2ad92eb2873fab947918a466f4c34e5a1e659ac15fe18a733d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139515,8 +140939,10 @@ self: {
        testHaskellDepends = [
          base binary bytestring filepath hlint tasty tasty-hspec
        ];
+       homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -140124,6 +141550,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -140142,6 +141569,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-thread" = callPackage
@@ -142989,8 +144417,8 @@ self: {
      }:
      mkDerivation {
        pname = "resolve-trivial-conflicts";
-       version = "0.3.2.2";
-       sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b";
+       version = "0.3.2.3";
+       sha256 = "12459698d44496475f48a5f62a8fba5cd746b0aa7552fa577304ee875f85c596";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145034,22 +146462,23 @@ self: {
      }) {};
 
   "rss2irc" = callPackage
-    ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs
-     , containers, deepseq, feed, http-client, http-conduit, http-types
-     , io-storage, irc, network, old-locale, parsec, regexpr, resourcet
-     , safe, split, text, time, transformers, utf8-string
+    ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq
+     , feed, http-client, http-conduit, http-types, io-storage, irc
+     , network, network-uri, old-locale, parsec, regexpr, resourcet
+     , safe, SafeSemaphore, split, stm, text, time, transformers
+     , utf8-string
      }:
      mkDerivation {
        pname = "rss2irc";
-       version = "1.0.6";
-       sha256 = "bca14708ca66719261c36d328e6e3801b01b0a62a5525560aad70b7f5276d43d";
+       version = "1.1";
+       sha256 = "583826c4cb2204034d866f6bab85132b1484e70901b5244e8f76cfe020a60cde";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring cabal-file-th cmdargs containers deepseq feed
-         http-client http-conduit http-types io-storage irc network
-         old-locale parsec regexpr resourcet safe split text time
-         transformers utf8-string
+         base bytestring cmdargs containers deepseq feed http-client
+         http-conduit http-types io-storage irc network network-uri
+         old-locale parsec regexpr resourcet safe SafeSemaphore split stm
+         text time transformers utf8-string
        ];
        homepage = "http://hackage.haskell.org/package/rss2irc";
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
@@ -145606,6 +147035,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_9_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, template-haskell, text, time, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.9.2";
+       sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers old-time template-haskell
+         text time vector
+       ];
+       testHaskellDepends = [
+         array base cereal containers lens lens-action QuickCheck
+         quickcheck-instances tasty tasty-quickcheck template-haskell time
+         vector
+       ];
+       homepage = "https://github.com/acid-state/safecopy";
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safeint" = callPackage
     ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -146233,8 +147686,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "1.2.2";
-       sha256 = "2629bbcc34c50544b451567c6b314837209e4199133154cab9c0f07803231e16";
+       version = "1.2.8";
+       sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146304,6 +147757,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sbv_5_13" = callPackage
+    ({ mkDerivation, array, async, base, base-compat, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc
+     , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "5.13";
+       sha256 = "65d1bb21c19ddad03a9dcf19f18d6221c8633428adeda7de11214468c984afbe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat containers crackNum
+         data-binary-ieee754 deepseq directory filepath ghc mtl old-time
+         pretty process QuickCheck random syb
+       ];
+       executableHaskellDepends = [
+         base data-binary-ieee754 directory filepath HUnit process syb
+       ];
+       testHaskellDepends = [
+         base data-binary-ieee754 directory filepath HUnit syb
+       ];
+       homepage = "http://leventerkok.github.com/sbv/";
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -147478,6 +148959,7 @@ self: {
        executableHaskellDepends = [ base linear sdl2 vector ];
        description = "Bindings to SDL2_gfx";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
 
   "sdl2-image" = callPackage
@@ -147959,6 +149441,7 @@ self: {
        homepage = "https://toktok.github.io/semdoc";
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semi-iso" = callPackage
@@ -148081,6 +149564,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "semiring-num" = callPackage
+    ({ mkDerivation, base, containers, doctest, smallcheck }:
+     mkDerivation {
+       pname = "semiring-num";
+       version = "0.3.0.0";
+       sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers doctest smallcheck ];
+       homepage = "https://github.com/oisdk/semiring-num";
+       description = "Basic semiring class and instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "semiring-simple" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -148524,6 +150020,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serialize-instances" = callPackage
+    ({ mkDerivation, base, cereal, hashable, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serialize-instances";
+       version = "0.1.0.0";
+       sha256 = "9c3207fc4cad06fbe76c860820fc48f967494b73ce892efe997723c34b9308d5";
+       revision = "2";
+       editedCabalFile = "f95554330e4ab10ef1c1a3f291f41ce19bfa4be3c056466a410fbc0f980977c9";
+       libraryHaskellDepends = [
+         base cereal hashable semigroups unordered-containers
+       ];
+       description = "Instances for Serialize of cereal";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "serialport" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, unix }:
      mkDerivation {
@@ -148537,6 +150050,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "serokell-util" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-extra, base
+     , base16-bytestring, base64-bytestring, binary, binary-orphans
+     , bytestring, cereal, cereal-vector, clock, containers
+     , data-msgpack, deepseq, directory, either, exceptions, extra
+     , filepath, formatting, hashable, hspec, lens, mtl
+     , optparse-applicative, parsec, QuickCheck, quickcheck-instances
+     , safecopy, scientific, semigroups, template-haskell, text
+     , text-format, time-units, transformers, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "serokell-util";
+       version = "0.1.1.1";
+       sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427";
+       libraryHaskellDepends = [
+         acid-state aeson aeson-extra base base16-bytestring
+         base64-bytestring binary binary-orphans bytestring cereal
+         cereal-vector clock containers data-msgpack deepseq directory
+         either exceptions extra filepath formatting hashable lens mtl
+         optparse-applicative parsec QuickCheck quickcheck-instances
+         safecopy scientific semigroups template-haskell text text-format
+         time-units transformers unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring cereal data-msgpack hspec QuickCheck
+         quickcheck-instances safecopy scientific text text-format
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/serokell/serokell-util";
+       description = "General-purpose functions by Serokell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "serpentine" = callPackage
     ({ mkDerivation, base, pringletons, singletons, template-haskell
      , text, vinyl
@@ -148712,6 +150259,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -148735,6 +150283,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -148813,6 +150362,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -148887,6 +150437,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -149066,6 +150617,7 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-docs" = callPackage
@@ -149378,8 +150930,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-matrix-param";
-       version = "0.3.1";
-       sha256 = "2559133dee1629ddfca41aca6d7ac0f3b0283ae3470228bd5bd71ce4c79f6641";
+       version = "0.3.3";
+       sha256 = "679e8f5a6e77c1022ae4b23555fbbca2b34d1fd249ab459c670db5c98eb988b3";
        libraryHaskellDepends = [ base servant ];
        testHaskellDepends = [
          aeson base bytestring containers doctest hspec http-client
@@ -151442,6 +152994,7 @@ self: {
        homepage = "https://github.com/mdibaiee/sibe";
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sieve" = callPackage
@@ -152629,6 +154182,7 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sirkel" = callPackage
@@ -155203,19 +156757,19 @@ self: {
      }) {};
 
   "socket-sctp" = callPackage
-    ({ mkDerivation, base, bytestring, sctp, socket }:
+    ({ mkDerivation, base, bytestring, lksctp-tools, socket }:
      mkDerivation {
        pname = "socket-sctp";
        version = "0.1.0.0";
        sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5";
        libraryHaskellDepends = [ base bytestring socket ];
-       librarySystemDepends = [ sctp ];
+       librarySystemDepends = [ lksctp-tools ];
        testHaskellDepends = [ base bytestring socket ];
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {sctp = null;};
+     }) {inherit (pkgs) lksctp-tools;};
 
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
@@ -155782,8 +157336,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.0.9";
-       sha256 = "e71d62721edb02d38e578d6c286af76ad7a98638a8b4e398efd3ca7e280371de";
+       version = "0.2.1.0";
+       sha256 = "83e00cc3e244cea190c407b88660427ffe2019175d1b5aade1dbfb6c0e0ffaa7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156014,8 +157568,8 @@ self: {
      }:
      mkDerivation {
        pname = "speedy-slice";
-       version = "0.1.3";
-       sha256 = "8be147fe85bf02f1e5bb7cc32e3a61c418354af8875fadb0cd20e4fe804f3992";
+       version = "0.1.4";
+       sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92";
        libraryHaskellDepends = [
          base lens mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -156064,23 +157618,6 @@ self: {
      }) {};
 
   "sphinx" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
-     , network, text, text-icu, xml
-     }:
-     mkDerivation {
-       pname = "sphinx";
-       version = "0.6.0.1";
-       sha256 = "28496ed2f52d5934de64cbb6b045a37848d2590a65b756000280d132932795dd";
-       libraryHaskellDepends = [
-         base binary bytestring data-binary-ieee754 network text text-icu
-         xml
-       ];
-       homepage = "https://github.com/gregwebs/haskell-sphinx-client";
-       description = "Haskell bindings to the Sphinx full-text searching daemon";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sphinx_0_6_0_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , network, text, text-icu, xml
      }:
@@ -156095,7 +157632,6 @@ self: {
        homepage = "https://github.com/gregwebs/haskell-sphinx-client";
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sphinx-cli" = callPackage
@@ -157081,6 +158617,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_0_1_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , directory, exceptions, file-embed, filepath, hspec
+     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "0.1.8";
+       sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory exceptions
+         filepath megaparsec mtl template-haskell text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec text yaml
+       ];
+       homepage = "https://github.com/stackbuilders/stache";
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
      , attoparsec, base, base-compat, base16-bytestring
@@ -158001,21 +159562,26 @@ self: {
      }) {};
 
   "staversion" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath
-     , hspec, optparse-applicative, text, unordered-containers, yaml
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, http-client, http-client-tls, http-types
+     , optparse-applicative, QuickCheck, text, transformers
+     , transformers-compat, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.1.0.0";
-       sha256 = "df252adb8010dbe2553fcd467044a6f99b43ce0ad223762ead0f755484806073";
+       version = "0.1.1.0";
+       sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring directory filepath optparse-applicative text
-         unordered-containers yaml
+         aeson base bytestring containers directory filepath http-client
+         http-client-tls http-types optparse-applicative text transformers
+         transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base filepath hspec text ];
+       testHaskellDepends = [
+         base bytestring filepath hspec QuickCheck text
+       ];
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
@@ -158446,8 +160012,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-split";
-       version = "0.0.0.1";
-       sha256 = "88f3bd9b210377919218a117fd27d1b8350af6aaf65b2f2df2be72e896456314";
+       version = "0.0.1";
+       sha256 = "001c3ceeb61498b11791225c4985cf6a9fa7e218a9b0631d54b57cc4837421b9";
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
@@ -160472,8 +162038,8 @@ self: {
      }:
      mkDerivation {
        pname = "svgcairo";
-       version = "0.13.1.0";
-       sha256 = "055adbb80d21091be3703215f1d210f5b40c762adc8450a45a9a39bdc20315a5";
+       version = "0.13.1.1";
+       sha256 = "cda662acf9084ef1d16da987bde2fa01c9efc87101e7179da0f566ab05c3a54f";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
@@ -162080,6 +163646,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged-identity" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "tagged-identity";
+       version = "0.1.1";
+       sha256 = "dcf0676dca1422165d48795ab1e4a512a6fd678aef685c85c00b5fcaba001aa8";
+       libraryHaskellDepends = [ base mtl transformers ];
+       homepage = "https://github.com/mrkkrp/tagged-identity";
+       description = "Trivial monad transformer that allows identical monad stacks have different types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tagged-list" = callPackage
     ({ mkDerivation, AbortT-transformers, base, binary, natural-number
      , type-equality, type-level-natural-number
@@ -162601,6 +164179,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit-combinators }:
+     mkDerivation {
+       pname = "tar-conduit";
+       version = "0.1.0";
+       sha256 = "64cd8ea8d072b3a43e539e3c8d1f9e0936430ad9f9ff3a54d1e237c077878e2f";
+       libraryHaskellDepends = [ base bytestring conduit-combinators ];
+       homepage = "https://github.com/snoyberg/tar-conduit#readme";
+       description = "Parse tar files using conduit for streaming";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mmorph, mtl }:
      mkDerivation {
@@ -162770,6 +164360,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-discover" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "tasty-discover";
+       version = "1.0.0";
+       sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-th
+       ];
+       executableHaskellDepends = [ base directory filepath tasty-th ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/lwm/tasty-discover/";
+       description = "Automatically discover and run Tasty framework tests";
+       license = "GPL";
+     }) {};
+
   "tasty-expected-failure" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
@@ -163398,6 +165009,7 @@ self: {
        homepage = "https://github.com/akru/telegram-bot#readme";
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teleport" = callPackage
@@ -164543,8 +166155,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.6.6";
-       sha256 = "9c78e53e685b4537a39a4d2bc785df1d0d0ee775085bd532d8ae88d10d4c58b4";
+       version = "0.8.6.7";
+       sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88";
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -165192,8 +166804,8 @@ self: {
     ({ mkDerivation, base, deepseq, text, vector }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.8.1";
-       sha256 = "8bedb4c3aa8b998508d1af4f65e99f4ca53dc3803e58375c324bbff3f5542b6d";
+       version = "0.8.3";
+       sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f";
        libraryHaskellDepends = [ base deepseq text vector ];
        homepage = "https://github.com/jtdaugherty/text-zipper/";
        description = "A text editor zipper library";
@@ -166862,12 +168474,13 @@ self: {
     ({ mkDerivation, base, process, time }:
      mkDerivation {
        pname = "timeconsole";
-       version = "0.1.0.0";
-       sha256 = "807921c815ca23a86691ae47c445fa9ea2c5cae6aa3ad748debd4314b3f6b97e";
+       version = "0.1.0.1";
+       sha256 = "519f2c90f2ee0b8d58f26fa67fecb83dc77002ed1ea94007b5c256155e9ff022";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
-       description = "Time commands by lines of STDOUT";
+       homepage = "https://github.com/xpika/Time-Console";
+       description = "time each line of terminal output";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -170527,6 +172140,7 @@ self: {
        homepage = "https://github.com/fpco/typed-process#readme";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -173963,6 +175577,7 @@ self: {
        homepage = "https://github.com/bitc/hs-vault-tool";
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -174475,8 +176090,8 @@ self: {
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.3.3.0";
-       sha256 = "902cc55e930ba703334425adc6090ce1ad4db38f01143fd9b92eba904c2bc58b";
+       version = "0.4.0.0";
+       sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061";
        libraryHaskellDepends = [ base deepseq vector ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
@@ -174728,6 +176343,7 @@ self: {
        homepage = "http://github.com/fmthoma/vgrep#readme";
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhd" = callPackage
@@ -175255,8 +176871,8 @@ self: {
      }:
      mkDerivation {
        pname = "vte";
-       version = "0.13.1.0";
-       sha256 = "6dc78551c75c393f2c8b9c463539293214ee788ad73c0623adc69f10b36f4a9d";
+       version = "0.13.1.1";
+       sha256 = "c38699a626af47be2c15ddcc7c9070fe5b9999fee73e3b479d1bafb96cdd5231";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -175272,8 +176888,8 @@ self: {
      }:
      mkDerivation {
        pname = "vtegtk3";
-       version = "0.13.1.0";
-       sha256 = "9da47c606db50183e1d9c19dc6626864a50c2838623836e65084951416452dfe";
+       version = "0.13.1.1";
+       sha256 = "5a61fe264daddeafe4ef47e6a09a00d323abe16bc8bef23441ac818284623067";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -175284,42 +176900,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , data-default, deepseq, directory, filepath, hashable, HUnit
-     , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
-     , QuickCheck, quickcheck-assertions, random, smallcheck, stm
-     , string-qq, terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.11.1";
-       sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers data-default deepseq
-         directory filepath hashable microlens microlens-mtl microlens-th
-         mtl parallel parsec stm terminfo text transformers unix utf8-string
-         vector
-       ];
-       executableHaskellDepends = [
-         base containers data-default microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers data-default deepseq
-         HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
-         random smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/coreyoconnor/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_11_3" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , data-default, deepseq, directory, filepath, hashable, HUnit
      , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
@@ -175353,7 +176933,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -177489,6 +179068,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-th_0_22_6" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
+     , template-haskell, text, web-routes
+     }:
+     mkDerivation {
+       pname = "web-routes-th";
+       version = "0.22.6";
+       sha256 = "e67472973238f1a6ed31c909e1021311da00a47f9d1c4dd0279bd1fca43eb9fb";
+       libraryHaskellDepends = [
+         base parsec split template-haskell text web-routes
+       ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
+       homepage = "https://github.com/happstack/web-routes-th";
+       description = "Support for deriving PathInfo using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-transformers" = callPackage
     ({ mkDerivation, base, transformers, web-routes }:
      mkDerivation {
@@ -177809,8 +179406,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkit";
-       version = "0.14.2.0";
-       sha256 = "3fdfe31a039f6168b0a694963fcdf2014e8928955b6fb88f0ef8f2c403473f51";
+       version = "0.14.2.1";
+       sha256 = "b80ef2a7d9def4245ec85f6065f62fc19fafe7ca3379a5def86e98eeaea1f550";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk mtl pango text transformers
@@ -177825,8 +179422,8 @@ self: {
     ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit-javascriptcore";
-       version = "0.14.2.0";
-       sha256 = "e0add063357a0798d6b40b9f8bab83395094199de3432570e4632a8d71a624e2";
+       version = "0.14.2.1";
+       sha256 = "ab36d0b283d6126826352fcfdc94a14073c05ad63818b4e3f2806707dc3e3f06";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
@@ -177841,8 +179438,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkitgtk3";
-       version = "0.14.2.0";
-       sha256 = "dd3e3bc62b31616681ffcee07df11b30155433a2cc7eea0560af53c7560f1a86";
+       version = "0.14.2.1";
+       sha256 = "6a71c475efbbfdac1c6d2fec12fb3c986dc13e09e1abdbde3dcf7a20421ab4f6";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
@@ -177857,8 +179454,8 @@ self: {
     ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
-       version = "0.14.2.0";
-       sha256 = "0eba3872499ca6fc54b24a8205297f01498eca2c7622e76c92458bc018ee1edc";
+       version = "0.14.2.1";
+       sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
@@ -178505,19 +180102,6 @@ self: {
      }) {};
 
   "withdependencies" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl }:
-     mkDerivation {
-       pname = "withdependencies";
-       version = "0.2.3";
-       sha256 = "eae91b83a4e93c9e31ba5aca90607234708cb65f247e8bc6813b6f25d3ddb8b7";
-       libraryHaskellDepends = [ base conduit containers mtl ];
-       testHaskellDepends = [ base conduit hspec HUnit mtl ];
-       homepage = "https://github.com/bartavelle/withdependencies";
-       description = "Run computations that depend on one or more elements in a stream";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "withdependencies_0_2_4" = callPackage
     ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
      , profunctors
      }:
@@ -178532,7 +180116,6 @@ self: {
        homepage = "https://github.com/bartavelle/withdependencies";
        description = "Run computations that depend on one or more elements in a stream";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witherable" = callPackage
@@ -180340,14 +181923,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xlsx-tabular_0_1_1" = callPackage
+  "xlsx-tabular_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
      mkDerivation {
        pname = "xlsx-tabular";
-       version = "0.1.1";
-       sha256 = "b266fd453913fede59a1d27122b675035829de7e7037eaa92de8a1e40f942f7d";
+       version = "0.2.0";
+       sha256 = "95ee0e839d58131a296580fdb73884a208ed017c9b1bfbda1ad05227ec54db77";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens text xlsx
        ];
@@ -180830,6 +182413,7 @@ self: {
        homepage = "https://github.com/sinelaw/xml-to-json";
        description = "Library and command line tool for converting XML files to json";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-to-json-fast" = callPackage
@@ -182715,6 +184299,7 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -183025,30 +184610,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.4.7.1";
-       sha256 = "66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_4_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -183070,7 +184631,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -185383,25 +186943,6 @@ self: {
      }) {inherit (pkgs) zlib;};
 
   "zlib" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck, zlib
-     }:
-     mkDerivation {
-       pname = "zlib";
-       version = "0.6.1.1";
-       sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735";
-       revision = "3";
-       editedCabalFile = "b5fff98d06289c9c16ab78d994f88f18345ccf7d0ef3e5334bb417d763b07046";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zlib;};
-
-  "zlib_0_6_1_2" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, zlib
      }:
@@ -185416,7 +186957,6 @@ self: {
        ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 27368580de0..78d154bb654 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
+    mkdir -p $out/share/doc/groovy
     rm bin/*.bat
-    mv * $out
+    mv {bin,conf,embeddable,grooid,indy,lib} $out
+    mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
 
     sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy
 
@@ -27,8 +29,6 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  phases = "unpackPhase installPhase";
-
   meta = with stdenv.lib; {
     description = "An agile dynamic language for the Java Platform";
     homepage = http://groovy-lang.org/;
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 8e462ffaacc..c7472076814 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -32,11 +32,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.6";
+  version = "6.7";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "1kzdi1n6h6hmz8zd9k8r5a5yp2ryi4w3c2fjm1k6cqicn18cwaxz";
+    sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy";
   };
 
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 7126a5140c3..336c861bbdc 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -129,6 +129,9 @@ let
           $out/bin/ruby setup.rb
           popd
 
+          # Remove unnecessary groff reference from runtime closure, since it's big
+          sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
+
           # Bundler tries to create this directory
           mkdir -pv $out/${passthru.gemPath}
           mkdir -p $out/nix-support
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 3f3627b6b23..7aa7244e234 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "zita-resampler-${version}";
-  version = "1.3.0";
+  version = "1.6.0";
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq";
+    sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h";
   };
 
   makeFlags = [
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index fc3b060b35e..71aa1874951 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty
-, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
+, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
@@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
     sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7";
   };
 
+  patches = [
+    # from https://bugs.freedesktop.org/show_bug.cgi?id=98165
+    (fetchpatch {
+      name = "cairo-CVE-2016-9082.patch";
+      url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
+      sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
+    })
+  ];
+
   prePatch = ''
     patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
   '';
diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix
deleted file mode 100644
index 00875d73f41..00000000000
--- a/pkgs/development/libraries/db/db-4.4.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.4.20";
-  extraPatches = [ ./cygwin-4.4.patch ];
-  sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9";
-  branch = "4.4";
-  drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix
deleted file mode 100644
index 84b5ea67420..00000000000
--- a/pkgs/development/libraries/db/db-4.5.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.5.20";
-  extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ];
-  sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m";
-  branch = "4.5";
-  drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix
deleted file mode 100644
index 6016d112d51..00000000000
--- a/pkgs/development/libraries/db/db-4.7.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.7.25";
-  sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
-  branch = "4.7";
-  drvArgs = { hardeningDisable = [ "format" ]; };
-})
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 60910b0d678..fe5ba503a40 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kactivities, karchive
+{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
 , knotifications, kpackage, kservice, kwindowsystem, kxmlgui
@@ -8,6 +8,13 @@
 kdeFramework {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  patches = [
+    (fetchurl {
+      url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5";
+      sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f";
+      name = "plasma-framework-osd-no-dialog.patch";
+    })
+  ];
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index a35ab14e253..788a5db13cd 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "1.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
   };
 
-  buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ];
+  buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
 
   meta = with stdenv.lib; {
     description = "Cross platform audio input and output";
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 577006f9014..4831f150f45 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -12,6 +12,14 @@ in stdenv.mkDerivation rec {
     sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2016-4658.patch";
+      url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b";
+      sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb";
+    })
+  ];
+
   # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5
   postPatch = "patch -R < " + fetchpatch {
     name = "schemas-validity.patch";
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 6c77f6a004a..9011d33e922 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchurl, cmake }:
-let version = "3.0.0";
-in stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
   name = "tinyxml-2-${version}";
-  src = fetchurl {
-    url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz";
-    sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    repo = "tinyxml2";
+    owner = "leethomason";
+    rev = version;
+    sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y";
   };
 
   nativeBuildInputs = [ cmake ];
 
   meta = {
+    description = "A simple, small, efficient, C++ XML parser";
+    homepage = http://www.grinninglizard.com/tinyxml2/index.html;
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.zlib;
   };
 }
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix
index 5700a7d144e..25d7849b1b4 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/pkgs/development/libraries/tre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
   name = "tre-0.8.0";
@@ -7,6 +7,13 @@ stdenv.mkDerivation rec {
     sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859;
+      sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p";
+    })
+  ];
+
   meta = {
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index 0fb34e5953e..8ae95bc942e 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-mvtools-${version}";
-  version = "16";
+  version = "17";
 
   src = fetchFromGitHub {
     owner = "dubhater";
     repo  = "vapoursynth-mvtools";
-    rev    = "48959b868c18fa8066502f957734cbd5fb9762a0";
-    sha256 = "15xpqvfzhv0kcf3gyghni4flazi1mmj2iy6zw5834phqr52yg07z";
+    rev    = "a2f5607420af8b8e76c0a6a06a517649bfa2c187";
+    sha256 = "06nq46jjyfpv74i27w2m6j64avs6shl99mk601m5h5mmdgm2mvcg";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 12cba8decc7..cfa2c3fa1f2 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R33.1";
+  version = "R35";
 
   src = fetchFromGitHub {
     owner = "vapoursynth";
     repo  = "vapoursynth";
-    rev    = "0d69d29abb3c4ba9e806958bf9c539bd6eff6852";
-    sha256 = "1dbz81vgqfsb306d7891p8y25y7632y32ii3l64shr0jsq64vgsm";
+    rev    = "dcab1529d445776a5575859aea655e613c23c8bc";
+    sha256 = "0nhpqws91b19lql2alc5pxgzfgh1wjrws0kyvir41jhfxhhjaqpi";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9e8de5a5aac..d1d0735e46d 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.2.1";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "sekrit-twc";
     repo  = "zimg";
-    rev    = "e88b156fdd6d5ae647bfc68a30e86d14f214764d";
-    sha256 = "1hb35pm9ykdyhg71drd59yy29d154m2r1mr8ikyzpi3knanjn23a";
+    rev    = "9cbe9b0de66a690bdd142bae0e656e27c1f50ade";
+    sha256 = "1qj5fr8ghgnyfjzdvgkvplicqsgyp05g3pvsdrg9yivvx32291hp";
   };
 
   buildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v6.nix
similarity index 92%
rename from pkgs/development/node-packages/composition-v5.nix
rename to pkgs/development/node-packages/composition-v6.nix
index be9201677ce..289a8ab1201 100644
--- a/pkgs/development/node-packages/composition-v5.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -10,7 +10,7 @@ let
     inherit nodejs;
   };
 in
-import ./node-packages-v5.nix {
+import ./node-packages-v6.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/default-v0_10.nix b/pkgs/development/node-packages/default-v0_10.nix
deleted file mode 100644
index baaadb39160..00000000000
--- a/pkgs/development/node-packages/default-v0_10.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{pkgs, system, nodejs}:
-
-let
-  nodePackages = import ./composition-v4.nix {
-    inherit pkgs system nodejs;
-  };
-in
-nodePackages // {
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
-  
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-  });
-  
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-    
-    preRebuild = ''
-      mkdir $TMPDIR/webdrvr
-      
-      ln -s ${pkgs.fetchurl {
-        url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
-        sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
-      }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
-      ln -s ${pkgs.fetchurl {
-        url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
-        sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
-      }} $TMPDIR/webdrvr/chromedriver_linux64.zip
-    '';
-  });
-}
diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix
deleted file mode 100644
index 00dce5966aa..00000000000
--- a/pkgs/development/node-packages/default-v5.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{pkgs, system, nodejs}:
-
-let
-  nodePackages = import ./composition-v5.nix {
-    inherit pkgs system nodejs;
-  };
-in
-nodePackages // {
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
-  
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
-  
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-    
-    preRebuild = ''
-      mkdir $TMPDIR/webdrvr
-      
-      ln -s ${pkgs.fetchurl {
-        url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
-        sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
-      }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
-      ln -s ${pkgs.fetchurl {
-        url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
-        sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
-      }} $TMPDIR/webdrvr/chromedriver_linux64.zip
-    '';
-    
-    dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  });
-
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
-    postInstall = ''
-      for prog in bower2nix fetch-bower; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
-      done
-    '';
-  });
-}
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 00dce5966aa..8e6aeac9683 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -1,7 +1,7 @@
 {pkgs, system, nodejs}:
 
 let
-  nodePackages = import ./composition-v5.nix {
+  nodePackages = import ./composition-v6.nix {
     inherit pkgs system nodejs;
   };
 in
@@ -29,10 +29,14 @@ nodePackages // {
         sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
       }} $TMPDIR/webdrvr/chromedriver_linux64.zip
     '';
-    
+
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   });
 
+  npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
+    postInstall = "npm run-script prepublish";
+  };
+
   bower2nix = nodePackages.bower2nix.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
     postInstall = ''
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 385463423ea..613293e850b 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -2,4 +2,5 @@
 
 rm -f node-env.nix
 node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix
-node2nix -5 -i node-packages.json -o node-packages-v5.nix -c composition-v5.nix
+# node2nix doesn't explicitely support node v6 so far
+node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 2a04b3dfba8..5819fd1c2e7 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -121,7 +121,7 @@ let
       if [ -f "${src}" ]
       then
           # Figure out what directory has been unpacked
-          packageDir="$(find . -type d -maxdepth 1 | tail -1)"
+          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
 
           # Restore write permissions to make building work
           find "$packageDir" -type d -print0 | xargs -0 chmod u+x
@@ -131,15 +131,23 @@ let
           mv "$packageDir" "$DIR/${packageName}"
       elif [ -d "${src}" ]
       then
-          strippedName="$(stripHash ${src})"
+          # Get a stripped name (without hash) of the source directory.
+          # On old nixpkgs it's already set internally.
+          if [ -z "$strippedName" ]
+          then
+              strippedName="$(stripHash ${src})"
+          fi
 
           # Restore write permissions to make building work
-          chmod -R u+w $strippedName
+          chmod -R u+w "$strippedName"
 
           # Move the extracted directory into the output folder
-          mv $strippedName "$DIR/${packageName}"
+          mv "$strippedName" "$DIR/${packageName}"
       fi
 
+      # Unset the stripped name to not confuse the next unpack step
+      unset strippedName
+
       # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
       # The following JavaScript replaces these by * to prevent that
       cd "$DIR/${packageName}"
@@ -204,6 +212,9 @@ let
 
         if [ "$dontNpmInstall" != "1" ]
         then
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
 
@@ -260,10 +271,13 @@ let
           # calling executables outside the Nix store as much as possible
           patchShebangs .
 
-          export HOME=$TMPDIR
+          export HOME=$PWD
           npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
           ${stdenv.lib.optionalString (!dontNpmInstall) ''
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
           ''}
 
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 0cfdd2b62ef..0e4de5f6bb7 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -229,13 +229,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "amdefine-1.0.0" = {
+    "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
-        sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
       };
     };
     "wordwrap-0.0.3" = {
@@ -418,13 +418,13 @@ let
         sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
       };
     };
-    "azure-arm-commerce-0.1.1" = {
+    "azure-arm-commerce-0.2.0" = {
       name = "azure-arm-commerce";
       packageName = "azure-arm-commerce";
-      version = "0.1.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz";
-        sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59";
+        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
+        sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
     "azure-arm-compute-0.19.0" = {
@@ -436,13 +436,13 @@ let
         sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
       };
     };
-    "azure-arm-hdinsight-0.2.0" = {
+    "azure-arm-hdinsight-0.2.2" = {
       name = "azure-arm-hdinsight";
       packageName = "azure-arm-hdinsight";
-      version = "0.2.0";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz";
-        sha1 = "13d2cff9110485970bf063c7411eefe148e3790f";
+        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
       };
     };
     "azure-arm-hdinsight-jobs-0.1.0" = {
@@ -463,13 +463,13 @@ let
         sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
       };
     };
-    "azure-arm-iothub-0.1.1" = {
+    "azure-arm-iothub-0.1.4" = {
       name = "azure-arm-iothub";
       packageName = "azure-arm-iothub";
-      version = "0.1.1";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz";
-        sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535";
+        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
+        sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
       };
     };
     "azure-arm-servermanagement-0.1.2" = {
@@ -517,13 +517,13 @@ let
         sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2";
       };
     };
-    "azure-arm-website-0.11.0" = {
+    "azure-arm-website-0.11.4" = {
       name = "azure-arm-website";
       packageName = "azure-arm-website";
-      version = "0.11.0";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz";
-        sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79";
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz";
+        sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
     "azure-arm-rediscache-0.2.1" = {
@@ -580,13 +580,13 @@ let
         sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
       };
     };
-    "azure-keyvault-0.10.2" = {
+    "azure-keyvault-0.11.0" = {
       name = "azure-keyvault";
       packageName = "azure-keyvault";
-      version = "0.10.2";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz";
-        sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz";
+        sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
       };
     };
     "azure-asm-compute-0.17.0" = {
@@ -715,13 +715,13 @@ let
         sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce";
       };
     };
-    "azure-arm-batch-0.2.0" = {
+    "azure-arm-batch-0.3.0" = {
       name = "azure-arm-batch";
       packageName = "azure-arm-batch";
-      version = "0.2.0";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.2.0.tgz";
-        sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d";
+        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz";
+        sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7";
       };
     };
     "azure-batch-0.5.2" = {
@@ -859,40 +859,40 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
-    "kuduscript-1.0.8" = {
+    "kuduscript-1.0.9" = {
       name = "kuduscript";
       packageName = "kuduscript";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.8.tgz";
-        sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz";
+        sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.15.1" = {
+    "moment-2.15.2" = {
       name = "moment";
       packageName = "moment";
-      version = "2.15.1";
+      version = "2.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz";
-        sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c";
+        url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
+        sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
       };
     };
-    "ms-rest-1.15.0" = {
+    "ms-rest-1.15.2" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.0";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.0.tgz";
-        sha1 = "78e28043d6345d76916f9a63c46d9213cb34d54c";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz";
+        sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff";
       };
     };
-    "ms-rest-azure-1.15.0" = {
+    "ms-rest-azure-1.15.2" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.0";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.0.tgz";
-        sha1 = "72d7f874d7bdd4e52768666b34f8dfeb3f9ad9f8";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz";
+        sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83";
       };
     };
     "node-forge-0.6.23" = {
@@ -1336,13 +1336,13 @@ let
         sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
       };
     };
-    "base64-url-1.3.2" = {
+    "base64-url-1.3.3" = {
       name = "base64-url";
       packageName = "base64-url";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz";
-        sha1 = "4b08113b49d23889f306be64372762d31412f7a8";
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
       };
     };
     "xml2js-0.2.7" = {
@@ -1705,13 +1705,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "glob-7.1.0" = {
+    "glob-7.1.1" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz";
-        sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
+        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -1723,13 +1723,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "inflight-1.0.5" = {
+    "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz";
-        sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a";
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
       };
     };
     "minimatch-3.0.3" = {
@@ -1840,13 +1840,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.4.1" = {
+    "aws4-1.5.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz";
-        sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
+        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
       };
     };
     "bl-1.1.2" = {
@@ -1984,13 +1984,13 @@ let
         sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "tough-cookie-2.3.1" = {
+    "tough-cookie-2.3.2" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz";
-        sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
+        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -2011,22 +2011,22 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.0.1" = {
+    "async-2.1.2" = {
       name = "async";
       packageName = "async";
-      version = "2.0.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "lodash-4.16.2" = {
+    "lodash-4.16.6" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.16.2";
+      version = "4.16.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz";
-        sha1 = "3e626db827048a699281a8a125226326cfc0e652";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz";
+        sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777";
       };
     };
     "chalk-1.1.3" = {
@@ -2047,13 +2047,13 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "is-my-json-valid-2.14.0" = {
+    "is-my-json-valid-2.15.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.14.0";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz";
-        sha1 = "47bf808609b2df5d48c969c74becd09fbca02725";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
+        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2146,13 +2146,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-2.0.0" = {
+    "jsonpointer-4.0.0" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "2.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
-        sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
+        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
       };
     };
     "xtend-4.0.1" = {
@@ -2362,6 +2362,15 @@ let
         sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
       };
     };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
     "asn1-0.1.11" = {
       name = "asn1";
       packageName = "asn1";
@@ -2389,13 +2398,13 @@ let
         sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
       };
     };
-    "fibers-1.0.14" = {
+    "fibers-1.0.15" = {
       name = "fibers";
       packageName = "fibers";
-      version = "1.0.14";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.14.tgz";
-        sha1 = "824bc9a950691a0b2a52c30a69ddf62bc158d1ca";
+        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
+        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
       };
     };
     "galaxy-0.1.12" = {
@@ -2452,6 +2461,15 @@ let
         sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
       };
     };
+    "qs-6.3.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
+        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
+      };
+    };
     "asap-2.0.5" = {
       name = "asap";
       packageName = "asap";
@@ -2686,13 +2704,13 @@ let
         sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee";
       };
     };
-    "duplexify-3.4.5" = {
+    "duplexify-3.5.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.4.5";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.4.5.tgz";
-        sha1 = "0e7e287a775af753bf57e6e7b7f21f183f6c3a53";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
+        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -2974,13 +2992,13 @@ let
         sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
       };
     };
-    "spdx-expression-parse-1.0.3" = {
+    "spdx-expression-parse-1.0.4" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz";
-        sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
+        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
       };
     };
     "spdx-license-ids-1.2.2" = {
@@ -3037,13 +3055,13 @@ let
         sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "graceful-fs-4.1.9" = {
+    "graceful-fs-4.1.10" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.9";
+      version = "4.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz";
-        sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz";
+        sha1 = "f2d720c22092f743228775c75e3612632501f131";
       };
     };
     "parse-json-2.2.0" = {
@@ -3163,13 +3181,13 @@ let
         sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
-    "klaw-1.3.0" = {
+    "klaw-1.3.1" = {
       name = "klaw";
       packageName = "klaw";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.0.tgz";
-        sha1 = "8857bfbc1d824badf13d3d0241d8bbe46fb12f73";
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
     "q-1.4.1" = {
@@ -3262,6 +3280,15 @@ let
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
+    "cached-path-relative-1.0.0" = {
+      name = "cached-path-relative";
+      packageName = "cached-path-relative";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz";
+        sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
+      };
+    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3388,13 +3415,13 @@ let
         sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
       };
     };
-    "module-deps-4.0.7" = {
+    "module-deps-4.0.8" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "4.0.7";
+      version = "4.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.7.tgz";
-        sha1 = "edfeb3937be7359bc14a6672c22ef124887f6ed2";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz";
+        sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb";
       };
     };
     "os-browserify-0.1.2" = {
@@ -3433,15 +3460,6 @@ let
         sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1";
       };
     };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
     "querystring-es3-0.2.1" = {
       name = "querystring-es3";
       packageName = "querystring-es3";
@@ -3487,13 +3505,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.4.0" = {
+    "stream-http-2.4.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz";
-        sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
+        sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
       };
     };
     "subarg-1.0.0" = {
@@ -3649,13 +3667,13 @@ let
         sha1 = "a39992d723584811982be5e290bb6a53d86700f1";
       };
     };
-    "ieee754-1.1.6" = {
+    "ieee754-1.1.8" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.6";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz";
-        sha1 = "2e1013219c6d6712973ec54d981ec19e5579de97";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
+        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
       };
     };
     "date-now-0.1.4" = {
@@ -3721,13 +3739,13 @@ let
         sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
       };
     };
-    "pbkdf2-3.0.8" = {
+    "pbkdf2-3.0.9" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.8";
+      version = "3.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz";
-        sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz";
+        sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3955,13 +3973,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.3.1" = {
+    "detective-4.3.2" = {
       name = "detective";
       packageName = "detective";
-      version = "4.3.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz";
-        sha1 = "9fb06dd1ee8f0ea4dbcc607cda39d9ce1d4f726f";
+        url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz";
+        sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -3973,6 +3991,15 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -4729,13 +4756,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.2.3" = {
+    "simple-get-2.3.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.2.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz";
-        sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
+        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4783,13 +4810,22 @@ let
         sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
       };
     };
-    "unzip-response-1.0.1" = {
+    "simple-concat-1.0.0" = {
+      name = "simple-concat";
+      packageName = "simple-concat";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz";
+        sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
+      };
+    };
+    "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
-      version = "1.0.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz";
-        sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412";
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
     "once-1.2.0" = {
@@ -4963,13 +4999,13 @@ let
         sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
       };
     };
-    "ip-1.1.3" = {
+    "ip-1.1.4" = {
       name = "ip";
       packageName = "ip";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz";
-        sha1 = "12b16294a38925486d618a1103506e4eb4f8b296";
+        url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz";
+        sha1 = "de8247ffef940451832550fba284945e6e039bfb";
       };
     };
     "magnet-uri-4.2.3" = {
@@ -5539,13 +5575,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.0.1" = {
+    "exit-on-epipe-0.1.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.0.1";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz";
-        sha1 = "ea41650007098c8444519a5d48958170c4ad929b";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
+        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -5557,31 +5593,31 @@ let
         sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
       };
     };
-    "cordova-lib-6.3.1" = {
-      name = "cordova-lib";
-      packageName = "cordova-lib";
-      version = "6.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.3.1.tgz";
-        sha1 = "728b637cd6f6765f2c8727d4d09a650590ef217c";
-      };
-    };
-    "cordova-common-1.4.1" = {
+    "cordova-common-1.5.1" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "1.4.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.4.1.tgz";
-        sha1 = "8b4f07b3199b398fff553b32bff66676ecd30ab9";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz";
+        sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3";
       };
     };
-    "q-1.0.1" = {
-      name = "q";
-      packageName = "q";
-      version = "1.0.1";
+    "cordova-lib-6.4.0" = {
+      name = "cordova-lib";
+      packageName = "cordova-lib";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz";
-        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz";
+        sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
+      };
+    };
+    "insight-0.8.3" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
+        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
       };
     };
     "nopt-3.0.1" = {
@@ -5593,6 +5629,15 @@ let
         sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
       };
     };
+    "q-1.0.1" = {
+      name = "q";
+      packageName = "q";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz";
+        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+      };
+    };
     "underscore-1.7.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -5611,13 +5656,112 @@ let
         sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
       };
     };
-    "insight-0.8.3" = {
-      name = "insight";
-      packageName = "insight";
-      version = "0.8.3";
+    "ansi-0.3.1" = {
+      name = "ansi";
+      packageName = "ansi";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz";
+        sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
+      };
+    };
+    "bplist-parser-0.1.1" = {
+      name = "bplist-parser";
+      packageName = "bplist-parser";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz";
+        sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
+      };
+    };
+    "cordova-registry-mapper-1.1.15" = {
+      name = "cordova-registry-mapper";
+      packageName = "cordova-registry-mapper";
+      version = "1.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
+        sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
+      };
+    };
+    "elementtree-0.1.6" = {
+      name = "elementtree";
+      packageName = "elementtree";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
+        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+      };
+    };
+    "plist-1.2.0" = {
+      name = "plist";
+      packageName = "plist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
+        sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593";
+      };
+    };
+    "shelljs-0.5.3" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz";
+        sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113";
+      };
+    };
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+      };
+    };
+    "unorm-1.4.1" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz";
+        sha1 = "364200d5f13646ca8bcd44490271335614792300";
+      };
+    };
+    "big-integer-1.6.16" = {
+      name = "big-integer";
+      packageName = "big-integer";
+      version = "1.6.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
+        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+      };
+    };
+    "sax-0.3.5" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+      };
+    };
+    "base64-js-0.0.8" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
+        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
+      };
+    };
+    "xmlbuilder-4.0.0" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
+        sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
       };
     };
     "aliasify-1.9.0" = {
@@ -5629,15 +5773,6 @@ let
         sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030";
       };
     };
-    "cordova-app-hello-world-3.10.0" = {
-      name = "cordova-app-hello-world";
-      packageName = "cordova-app-hello-world";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.10.0.tgz";
-        sha1 = "e3825fc6ca950090a6a37437fcfb88c1622fd80e";
-      };
-    };
     "cordova-fetch-1.0.1" = {
       name = "cordova-fetch";
       packageName = "cordova-fetch";
@@ -5647,22 +5782,22 @@ let
         sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769";
       };
     };
-    "cordova-js-4.1.4" = {
-      name = "cordova-js";
-      packageName = "cordova-js";
-      version = "4.1.4";
+    "cordova-create-1.0.1" = {
+      name = "cordova-create";
+      packageName = "cordova-create";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.1.4.tgz";
-        sha1 = "33c67efcc751a4b36d91301c2e5bd409003daf13";
+        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz";
+        sha1 = "f1810401807ceec436ece27241180a83c97f8212";
       };
     };
-    "cordova-registry-mapper-1.1.15" = {
-      name = "cordova-registry-mapper";
-      packageName = "cordova-registry-mapper";
-      version = "1.1.15";
+    "cordova-js-4.2.0" = {
+      name = "cordova-js";
+      packageName = "cordova-js";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
-        sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz";
+        sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
     "cordova-serve-1.0.0" = {
@@ -5683,15 +5818,6 @@ let
         sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
       };
     };
-    "elementtree-0.1.6" = {
-      name = "elementtree";
-      packageName = "elementtree";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
-        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
-      };
-    };
     "init-package-json-1.9.4" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -5728,15 +5854,6 @@ let
         sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895";
       };
     };
-    "plist-1.2.0" = {
-      name = "plist";
-      packageName = "plist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
-        sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593";
-      };
-    };
     "properties-parser-0.2.3" = {
       name = "properties-parser";
       packageName = "properties-parser";
@@ -5863,13 +5980,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.4" = {
+    "shelljs-0.7.5" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.4";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.4.tgz";
-        sha1 = "b8f04b3a74ddfafea22acf98e0be45ded53d59c8";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
+        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
       };
     };
     "interpret-1.0.1" = {
@@ -5890,319 +6007,22 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "browserify-10.1.3" = {
+    "cordova-app-hello-world-3.11.0" = {
+      name = "cordova-app-hello-world";
+      packageName = "cordova-app-hello-world";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
+        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
+      };
+    };
+    "browserify-13.1.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "10.1.3";
+      version = "13.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz";
-        sha1 = "6605dcffbb918c6a69d9c60201d2397ef7ce20ff";
-      };
-    };
-    "browser-pack-4.0.4" = {
-      name = "browser-pack";
-      packageName = "browser-pack";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz";
-        sha1 = "8dae95a20ca43b3fea201faa6cfaa84ff4a0d484";
-      };
-    };
-    "buffer-3.6.0" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
-        sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
-      };
-    };
-    "builtins-0.0.7" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
-      };
-    };
-    "commondir-0.0.1" = {
-      name = "commondir";
-      packageName = "commondir";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
-        sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
-      };
-    };
-    "constants-browserify-0.0.1" = {
-      name = "constants-browserify";
-      packageName = "constants-browserify";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
-        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
-      };
-    };
-    "deps-sort-1.3.9" = {
-      name = "deps-sort";
-      packageName = "deps-sort";
-      version = "1.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz";
-        sha1 = "29dfff53e17b36aecae7530adbbbf622c2ed1a71";
-      };
-    };
-    "duplexer2-0.0.2" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
-        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
-      };
-    };
-    "events-1.0.2" = {
-      name = "events";
-      packageName = "events";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.0.2.tgz";
-        sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
-      };
-    };
-    "glob-4.5.3" = {
-      name = "glob";
-      packageName = "glob";
-      version = "4.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
-        sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
-      };
-    };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
-      };
-    };
-    "insert-module-globals-6.6.3" = {
-      name = "insert-module-globals";
-      packageName = "insert-module-globals";
-      version = "6.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz";
-        sha1 = "20638e29a30f9ed1ca2e3a825fbc2cba5246ddfc";
-      };
-    };
-    "labeled-stream-splicer-1.0.2" = {
-      name = "labeled-stream-splicer";
-      packageName = "labeled-stream-splicer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
-        sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65";
-      };
-    };
-    "module-deps-3.9.1" = {
-      name = "module-deps";
-      packageName = "module-deps";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz";
-        sha1 = "ea75caf9199090d25b0d5512b5acacb96e7f87f3";
-      };
-    };
-    "read-only-stream-1.1.1" = {
-      name = "read-only-stream";
-      packageName = "read-only-stream";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz";
-        sha1 = "5da77c799ed1388d3ef88a18471bb5924f8a0ba1";
-      };
-    };
-    "shallow-copy-0.0.1" = {
-      name = "shallow-copy";
-      packageName = "shallow-copy";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
-        sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
-      };
-    };
-    "shell-quote-0.0.1" = {
-      name = "shell-quote";
-      packageName = "shell-quote";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
-        sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
-      };
-    };
-    "stream-browserify-1.0.0" = {
-      name = "stream-browserify";
-      packageName = "stream-browserify";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
-        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
-      };
-    };
-    "through2-1.1.1" = {
-      name = "through2";
-      packageName = "through2";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
-        sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
-      };
-    };
-    "url-0.10.3" = {
-      name = "url";
-      packageName = "url";
-      version = "0.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
-        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
-      };
-    };
-    "combine-source-map-0.3.0" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
-        sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
-      };
-    };
-    "through2-0.5.1" = {
-      name = "through2";
-      packageName = "through2";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
-        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
-      };
-    };
-    "inline-source-map-0.3.1" = {
-      name = "inline-source-map";
-      packageName = "inline-source-map";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz";
-        sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
-      };
-    };
-    "convert-source-map-0.3.5" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
-        sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
-      };
-    };
-    "source-map-0.3.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
-        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
-      };
-    };
-    "xtend-3.0.0" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
-        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
-      };
-    };
-    "base64-js-0.0.8" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
-        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
-      };
-    };
-    "minimatch-2.0.10" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "2.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
-        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
-      };
-    };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
-      };
-    };
-    "combine-source-map-0.6.1" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz";
-        sha1 = "9b4a09c316033d768e0f11e029fa2730e079ad96";
-      };
-    };
-    "inline-source-map-0.5.0" = {
-      name = "inline-source-map";
-      packageName = "inline-source-map";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz";
-        sha1 = "4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af";
-      };
-    };
-    "source-map-0.4.4" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
-        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
-      };
-    };
-    "stream-splicer-1.3.2" = {
-      name = "stream-splicer";
-      packageName = "stream-splicer";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz";
-        sha1 = "3c0441be15b9bf4e226275e6dc83964745546661";
-      };
-    };
-    "readable-wrap-1.0.0" = {
-      name = "readable-wrap";
-      packageName = "readable-wrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
-        sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
-      };
-    };
-    "stream-combiner2-1.0.2" = {
-      name = "stream-combiner2";
-      packageName = "stream-combiner2";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
-        sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
+        url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
+        sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
     "compression-1.6.2" = {
@@ -6241,13 +6061,13 @@ let
         sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
       };
     };
-    "compressible-2.0.8" = {
+    "compressible-2.0.9" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.8";
+      version = "2.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz";
-        sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz";
+        sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425";
       };
     };
     "on-headers-1.0.1" = {
@@ -6556,15 +6376,6 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
-    "sax-0.3.5" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
-        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
-      };
-    };
     "npm-package-arg-4.2.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -6619,6 +6430,15 @@ let
         sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
       };
     };
+    "builtins-0.0.7" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      };
+    };
     "abbrev-1.0.9" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -6628,15 +6448,6 @@ let
         sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
       };
     };
-    "ansi-0.3.1" = {
-      name = "ansi";
-      packageName = "ansi";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz";
-        sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
-      };
-    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -6727,13 +6538,13 @@ let
         sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
       };
     };
-    "config-chain-1.1.10" = {
+    "config-chain-1.1.11" = {
       name = "config-chain";
       packageName = "config-chain";
-      version = "1.1.10";
+      version = "1.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz";
-        sha1 = "7fc383de0fcc84d711cb465bd176579cad612346";
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
       };
     };
     "dezalgo-1.0.3" = {
@@ -7240,15 +7051,6 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
-    "xmlbuilder-4.0.0" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
-        sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
-      };
-    };
     "bl-0.9.5" = {
       name = "bl";
       packageName = "bl";
@@ -7447,49 +7249,13 @@ let
         sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc";
       };
     };
-    "bplist-parser-0.1.1" = {
-      name = "bplist-parser";
-      packageName = "bplist-parser";
-      version = "0.1.1";
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz";
-        sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
-      };
-    };
-    "shelljs-0.5.3" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz";
-        sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113";
-      };
-    };
-    "underscore-1.8.3" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-      };
-    };
-    "unorm-1.4.1" = {
-      name = "unorm";
-      packageName = "unorm";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz";
-        sha1 = "364200d5f13646ca8bcd44490271335614792300";
-      };
-    };
-    "big-integer-1.6.16" = {
-      name = "big-integer";
-      packageName = "big-integer";
-      version = "1.6.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
-        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
     "configstore-1.4.0" = {
@@ -7501,150 +7267,6 @@ let
         sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021";
       };
     };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
-      };
-    };
-    "latest-version-1.0.1" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
-        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
-      };
-    };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
-      };
-    };
-    "string-length-1.0.1" = {
-      name = "string-length";
-      packageName = "string-length";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
-        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
-      };
-    };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
-      };
-    };
-    "write-file-atomic-1.2.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
-      };
-    };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
-      };
-    };
-    "package-json-1.2.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
-        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
-      };
-    };
-    "got-3.3.1" = {
-      name = "got";
-      packageName = "got";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
-        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
-      };
-    };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
-      };
-    };
-    "is-redirect-1.0.0" = {
-      name = "is-redirect";
-      packageName = "is-redirect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
-      };
-    };
-    "object-assign-3.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
-        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
-      };
-    };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
-      };
-    };
-    "rc-1.1.6" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
-        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
-      };
-    };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
-      };
-    };
-    "async-1.5.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
-      };
-    };
     "inquirer-0.10.1" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -7672,13 +7294,40 @@ let
         sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
       };
     };
-    "request-2.75.0" = {
+    "request-2.78.0" = {
       name = "request";
       packageName = "request";
-      version = "2.75.0";
+      version = "2.78.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
+    "uuid-2.0.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
+      };
+    };
+    "write-file-atomic-1.2.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+      };
+    };
+    "xdg-basedir-2.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
       };
     };
     "ansi-escapes-1.4.0" = {
@@ -7753,13 +7402,13 @@ let
         sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
       };
     };
-    "code-point-at-1.0.1" = {
+    "code-point-at-1.1.0" = {
       name = "code-point-at";
       packageName = "code-point-at";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz";
-        sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb";
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -7807,13 +7456,13 @@ let
         sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
       };
     };
-    "form-data-2.0.0" = {
+    "form-data-2.1.1" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
+        sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
       };
     };
     "asynckit-0.4.0" = {
@@ -7825,6 +7474,114 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
+    "is-npm-1.0.0" = {
+      name = "is-npm";
+      packageName = "is-npm";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+      };
+    };
+    "latest-version-1.0.1" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
+        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
+      };
+    };
+    "semver-diff-2.1.0" = {
+      name = "semver-diff";
+      packageName = "semver-diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    };
+    "string-length-1.0.1" = {
+      name = "string-length";
+      packageName = "string-length";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
+        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
+      };
+    };
+    "package-json-1.2.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
+        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
+      };
+    };
+    "got-3.3.1" = {
+      name = "got";
+      packageName = "got";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
+        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
+      };
+    };
+    "registry-url-3.1.0" = {
+      name = "registry-url";
+      packageName = "registry-url";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+      };
+    };
+    "is-redirect-1.0.0" = {
+      name = "is-redirect";
+      packageName = "is-redirect";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+      };
+    };
+    "object-assign-3.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+      };
+    };
+    "read-all-stream-3.1.0" = {
+      name = "read-all-stream";
+      packageName = "read-all-stream";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
+        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+      };
+    };
+    "rc-1.1.6" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
+        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
     "parserlib-1.0.0" = {
       name = "parserlib";
       packageName = "parserlib";
@@ -8540,13 +8297,13 @@ let
         sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
       };
     };
-    "level-sublevel-6.6.0" = {
+    "level-sublevel-6.6.1" = {
       name = "level-sublevel";
       packageName = "level-sublevel";
-      version = "6.6.0";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz";
-        sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f";
+        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz";
+        sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485";
       };
     };
     "leveldown-0.10.6" = {
@@ -8711,22 +8468,13 @@ let
         sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
       };
     };
-    "pull-stream-2.21.0" = {
-      name = "pull-stream";
-      packageName = "pull-stream";
-      version = "2.21.0";
+    "bytewise-1.1.0" = {
+      name = "bytewise";
+      packageName = "bytewise";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.21.0.tgz";
-        sha1 = "5b04e0bb35ffe64744fa9bb68465a84f9e1fe5d1";
-      };
-    };
-    "ltgt-2.1.2" = {
-      name = "ltgt";
-      packageName = "ltgt";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
-        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+        url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz";
+        sha1 = "1d13cbff717ae7158094aa881b35d081b387253e";
       };
     };
     "levelup-0.19.1" = {
@@ -8738,13 +8486,31 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
-    "bytewise-1.1.0" = {
-      name = "bytewise";
-      packageName = "bytewise";
-      version = "1.1.0";
+    "ltgt-2.1.2" = {
+      name = "ltgt";
+      packageName = "ltgt";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz";
-        sha1 = "1d13cbff717ae7158094aa881b35d081b387253e";
+        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
+        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+      };
+    };
+    "pull-level-2.0.3" = {
+      name = "pull-level";
+      packageName = "pull-level";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz";
+        sha1 = "9500635e257945d6feede185f5d7a24773455b17";
+      };
+    };
+    "pull-stream-3.5.0" = {
+      name = "pull-stream";
+      packageName = "pull-stream";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+        sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
       };
     };
     "typewiselite-1.0.0" = {
@@ -8756,13 +8522,31 @@ let
         sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e";
       };
     };
-    "pull-core-1.0.0" = {
-      name = "pull-core";
-      packageName = "pull-core";
-      version = "1.0.0";
+    "bytewise-core-1.2.3" = {
+      name = "bytewise-core";
+      packageName = "bytewise-core";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-core/-/pull-core-1.0.0.tgz";
-        sha1 = "e0eb93918dfa70963ed09e36f63daa15b76b38a4";
+        url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz";
+        sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
+      };
+    };
+    "typewise-1.0.3" = {
+      name = "typewise";
+      packageName = "typewise";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz";
+        sha1 = "1067936540af97937cc5dcf9922486e9fa284651";
+      };
+    };
+    "typewise-core-1.2.0" = {
+      name = "typewise-core";
+      packageName = "typewise-core";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz";
+        sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195";
       };
     };
     "bl-0.8.2" = {
@@ -8801,6 +8585,15 @@ let
         sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
       };
     };
+    "xtend-3.0.0" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      };
+    };
     "abstract-leveldown-0.12.4" = {
       name = "abstract-leveldown";
       packageName = "abstract-leveldown";
@@ -8810,31 +8603,76 @@ let
         sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
       };
     };
-    "bytewise-core-1.2.3" = {
-      name = "bytewise-core";
-      packageName = "bytewise-core";
-      version = "1.2.3";
+    "level-post-1.0.5" = {
+      name = "level-post";
+      packageName = "level-post";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz";
-        sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
+        url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz";
+        sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c";
       };
     };
-    "typewise-1.0.3" = {
-      name = "typewise";
-      packageName = "typewise";
-      version = "1.0.3";
+    "pull-cat-1.1.11" = {
+      name = "pull-cat";
+      packageName = "pull-cat";
+      version = "1.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz";
-        sha1 = "1067936540af97937cc5dcf9922486e9fa284651";
+        url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz";
+        sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
       };
     };
-    "typewise-core-1.2.0" = {
-      name = "typewise-core";
-      packageName = "typewise-core";
-      version = "1.2.0";
+    "pull-live-1.0.1" = {
+      name = "pull-live";
+      packageName = "pull-live";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz";
-        sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195";
+        url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz";
+        sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5";
+      };
+    };
+    "pull-pushable-2.0.1" = {
+      name = "pull-pushable";
+      packageName = "pull-pushable";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.0.1.tgz";
+        sha1 = "02bdca51a39cf585f483fbecde2fc9378076f212";
+      };
+    };
+    "pull-window-2.1.4" = {
+      name = "pull-window";
+      packageName = "pull-window";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz";
+        sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0";
+      };
+    };
+    "stream-to-pull-stream-1.7.2" = {
+      name = "stream-to-pull-stream";
+      packageName = "stream-to-pull-stream";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz";
+        sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde";
+      };
+    };
+    "looper-2.0.0" = {
+      name = "looper";
+      packageName = "looper";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz";
+        sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec";
+      };
+    };
+    "looper-3.0.0" = {
+      name = "looper";
+      packageName = "looper";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz";
+        sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
       };
     };
     "nan-2.1.0" = {
@@ -8891,13 +8729,22 @@ let
         sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
       };
     };
-    "got-6.5.0" = {
+    "async-2.0.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
+        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+      };
+    };
+    "got-6.6.1" = {
       name = "got";
       packageName = "got";
-      version = "6.5.0";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz";
-        sha1 = "67dcc727db871c7b250320860180e24d2db18a04";
+        url = "https://registry.npmjs.org/got/-/got-6.6.1.tgz";
+        sha1 = "542d7a0e34676060e561b1b90d103876eefabed2";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8972,13 +8819,13 @@ let
         sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
       };
     };
-    "unzip-response-2.0.1" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "2.0.1";
+    "timed-out-3.0.0" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
+        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8999,13 +8846,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "doctrine-1.4.0" = {
+    "babel-code-frame-6.16.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
+        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+      };
+    };
+    "doctrine-1.5.0" = {
       name = "doctrine";
       packageName = "doctrine";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz";
-        sha1 = "e2db32defa752407b935b381e89f3740e469e599";
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
+        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
       };
     };
     "escope-3.6.0" = {
@@ -9053,22 +8909,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.10.0" = {
+    "globals-9.12.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.10.0";
+      version = "9.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz";
-        sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7";
+        url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
+        sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
       };
     };
-    "ignore-3.1.5" = {
+    "ignore-3.2.0" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.1.5";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.1.5.tgz";
-        sha1 = "54ba1eb92ef9fff8d49e5a1fb23961cdba77eb7a";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz";
+        sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435";
       };
     };
     "inquirer-0.12.0" = {
@@ -9152,15 +9008,6 @@ let
         sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
       };
     };
-    "shelljs-0.6.1" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz";
-        sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8";
-      };
-    };
     "strip-bom-3.0.0" = {
       name = "strip-bom";
       packageName = "strip-bom";
@@ -9170,13 +9017,22 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "table-3.8.0" = {
+    "table-3.8.3" = {
       name = "table";
       packageName = "table";
-      version = "3.8.0";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz";
-        sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b";
+        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+      };
+    };
+    "js-tokens-2.0.0" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz";
+        sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5";
       };
     };
     "es6-map-0.1.4" = {
@@ -9251,15 +9107,6 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
     "flat-cache-1.2.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -9377,13 +9224,13 @@ let
         sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
-    "tryit-1.0.2" = {
+    "tryit-1.0.3" = {
       name = "tryit";
       packageName = "tryit";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tryit/-/tryit-1.0.2.tgz";
-        sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453";
+        url = "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz";
+        sha1 = "393be730a9446fd1ead6da59a014308f36c289cb";
       };
     };
     "argparse-1.0.9" = {
@@ -9476,13 +9323,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.7.5" = {
+    "ajv-4.8.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.7.5";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz";
-        sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
+        sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
       };
     };
     "ajv-keywords-1.1.1" = {
@@ -9503,6 +9350,15 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
+    "string-width-2.0.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
+        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -9512,6 +9368,15 @@ let
         sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
       };
     };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
     "glob-3.2.11" = {
       name = "glob";
       packageName = "glob";
@@ -9557,13 +9422,13 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
-    "forever-monitor-1.6.0" = {
+    "forever-monitor-1.7.1" = {
       name = "forever-monitor";
       packageName = "forever-monitor";
-      version = "1.6.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz";
-        sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40";
+        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz";
+        sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8";
       };
     };
     "nconf-0.6.9" = {
@@ -9656,13 +9521,13 @@ let
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "chokidar-1.6.0" = {
+    "chokidar-1.6.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz";
-        sha1 = "90c32ad4802901d7713de532dc284e96a63ad058";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz";
+        sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2";
       };
     };
     "ps-tree-0.0.3" = {
@@ -9728,13 +9593,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.14" = {
+    "fsevents-1.0.15" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.14";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz";
-        sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
+        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
       };
     };
     "micromatch-2.3.11" = {
@@ -9818,13 +9683,13 @@ let
         sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a";
       };
     };
-    "object.omit-2.0.0" = {
+    "object.omit-2.0.1" = {
       name = "object.omit";
       packageName = "object.omit";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz";
-        sha1 = "868597333d54e60662940bb458605dd6ae12fe94";
+        url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz";
+        sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa";
       };
     };
     "parse-glob-3.0.4" = {
@@ -9917,13 +9782,13 @@ let
         sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
       };
     };
-    "repeat-string-1.5.4" = {
+    "repeat-string-1.6.1" = {
       name = "repeat-string";
       packageName = "repeat-string";
-      version = "1.5.4";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz";
-        sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5";
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
     "is-posix-bracket-0.1.1" = {
@@ -9998,13 +9863,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.6.0" = {
+    "binary-extensions-1.7.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.6.0.tgz";
-        sha1 = "aa2184cbc434d29862c66a69bf81cc0a3383ee79";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
+        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -10016,13 +9881,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.30" = {
+    "node-pre-gyp-0.6.31" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.30";
+      version = "0.6.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.30.tgz";
-        sha1 = "64d3073a6f573003717ccfe30c89023297babba1";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
     "npmlog-4.0.0" = {
@@ -10034,13 +9899,13 @@ let
         sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
       };
     };
-    "tar-pack-3.1.4" = {
+    "tar-pack-3.3.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.1.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz";
-        sha1 = "bc8cf9a22f5832739f12f3910dac1eb97b49708c";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
+        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -10215,13 +10080,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.0" = {
+    "coffee-script-1.11.1" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz";
-        sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
       };
     };
     "jade-1.11.0" = {
@@ -10305,13 +10170,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.3" = {
+    "uglify-js-2.7.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.3";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
       };
     };
     "void-elements-2.0.1" = {
@@ -10341,6 +10206,15 @@ let
         sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
       };
     };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
     "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
@@ -10836,6 +10710,15 @@ let
         sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
       };
     };
+    "duplexer2-0.0.2" = {
+      name = "duplexer2";
+      packageName = "duplexer2";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
+      };
+    };
     "clone-stats-0.0.1" = {
       name = "clone-stats";
       packageName = "clone-stats";
@@ -10845,22 +10728,22 @@ let
         sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
       };
     };
-    "findup-sync-0.4.2" = {
+    "findup-sync-0.4.3" = {
       name = "findup-sync";
       packageName = "findup-sync";
-      version = "0.4.2";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz";
-        sha1 = "a8117d0f73124f5a4546839579fe52d7129fb5e5";
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz";
+        sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12";
       };
     };
-    "fined-1.0.1" = {
+    "fined-1.0.2" = {
       name = "fined";
       packageName = "fined";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.0.1.tgz";
-        sha1 = "c48af9ab5a8e0f400a0375e84154c37674dabfd4";
+        url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz";
+        sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97";
       };
     };
     "flagged-respawn-0.3.2" = {
@@ -10944,15 +10827,6 @@ let
         sha1 = "127a97f02adc41751a954d24b0de17e100e038eb";
       };
     };
-    "lodash.isarray-4.0.0" = {
-      name = "lodash.isarray";
-      packageName = "lodash.isarray";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz";
-        sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403";
-      };
-    };
     "lodash.isempty-4.4.0" = {
       name = "lodash.isempty";
       packageName = "lodash.isempty";
@@ -10980,13 +10854,13 @@ let
         sha1 = "159d6155d43904d16c10ef698911da1e91969b73";
       };
     };
-    "is-absolute-0.2.5" = {
+    "is-absolute-0.2.6" = {
       name = "is-absolute";
       packageName = "is-absolute";
-      version = "0.2.5";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.5.tgz";
-        sha1 = "994142b9f468d27c14fbf0cd30fe77db934ca76d";
+        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz";
+        sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb";
       };
     };
     "map-cache-0.2.2" = {
@@ -11106,6 +10980,24 @@ let
         sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
       };
     };
+    "glob-4.5.3" = {
+      name = "glob";
+      packageName = "glob";
+      version = "4.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+        sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
+      };
+    };
+    "minimatch-2.0.10" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+      };
+    };
     "ordered-read-streams-0.1.0" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -11457,13 +11349,13 @@ let
         sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
       };
     };
-    "cli-1.0.0" = {
+    "cli-1.0.1" = {
       name = "cli";
       packageName = "cli";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz";
-        sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d";
+        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
+        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
     "bluebird-3.4.6" = {
@@ -11538,13 +11430,13 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.1" = {
+    "http-proxy-1.15.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.1";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz";
-        sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
+        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
       };
     };
     "isbinaryfile-3.0.1" = {
@@ -11628,13 +11520,13 @@ let
         sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
       };
     };
-    "custom-event-1.0.0" = {
+    "custom-event-1.0.1" = {
       name = "custom-event";
       packageName = "custom-event";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.0.tgz";
-        sha1 = "2e4628be19dc4b214b5c02630c5971e811618062";
+        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz";
+        sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
       };
     };
     "ent-2.2.0" = {
@@ -12510,13 +12402,13 @@ let
         sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
       };
     };
-    "vinyl-fs-2.4.3" = {
+    "vinyl-fs-2.4.4" = {
       name = "vinyl-fs";
       packageName = "vinyl-fs";
-      version = "2.4.3";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.3.tgz";
-        sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07";
+        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz";
+        sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
       };
     };
     "glob-stream-5.3.5" = {
@@ -12600,13 +12492,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.0" = {
+    "glob-parent-3.0.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz";
-        sha1 = "c7bdeb5260732196c740de9274c08814056014bb";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
+        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12636,22 +12528,31 @@ let
         sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
       };
     };
-    "is-glob-3.0.0" = {
+    "is-glob-3.1.0" = {
       name = "is-glob";
       packageName = "is-glob";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz";
-        sha1 = "e433c222db9d77844084d72db1eff047845985c1";
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
-    "is-extglob-2.0.0" = {
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
+    "is-extglob-2.1.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz";
-        sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
+        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -13257,13 +13158,22 @@ let
         sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
       };
     };
-    "cheerio-0.19.0" = {
+    "cheerio-0.22.0" = {
       name = "cheerio";
       packageName = "cheerio";
-      version = "0.19.0";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz";
-        sha1 = "772e7015f2ee29965096d71ea4175b75ab354925";
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
+        sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
+      };
+    };
+    "clone-2.0.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz";
+        sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e";
       };
     };
     "cookie-parser-1.4.3" = {
@@ -13275,22 +13185,13 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cors-2.7.1" = {
-      name = "cors";
-      packageName = "cors";
-      version = "2.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.7.1.tgz";
-        sha1 = "3c2e50a58af9ef8c89bee21226b099be1f02739b";
-      };
-    };
-    "cron-1.1.0" = {
+    "cron-1.1.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.0.tgz";
-        sha1 = "61e868c6f18f98e8bcb88bcd7ab9fb8fae909453";
+        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
+        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
       };
     };
     "follow-redirects-0.2.0" = {
@@ -13329,13 +13230,13 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.13.0" = {
+    "mqtt-1.14.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.13.0.tgz";
-        sha1 = "6060916c02efb938491b59b9e9dfec44ec8b2e87";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
+        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
       };
     };
     "mustache-2.2.1" = {
@@ -13347,13 +13248,13 @@ let
         sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
       };
     };
-    "oauth2orize-1.4.0" = {
+    "oauth2orize-1.5.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.4.0.tgz";
-        sha1 = "e9b9884b9111bff3eb3c797179e47c234d7a3df7";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
+        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13383,13 +13284,13 @@ let
         sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
       };
     };
-    "uglify-js-2.7.0" = {
+    "uglify-js-2.7.3" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.0";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz";
-        sha1 = "f021e38ba2ca740860f5bd5c695c2a817345f0ec";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
       };
     };
     "when-3.7.7" = {
@@ -13410,13 +13311,13 @@ let
         sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
       };
     };
-    "node-red-node-feedparser-0.1.5" = {
+    "node-red-node-feedparser-0.1.6" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.5";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.5.tgz";
-        sha1 = "88f2b68b3c00d2cd95498436baf9ed13b552b8d0";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
+        sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
       };
     };
     "node-red-node-email-0.1.11" = {
@@ -13446,13 +13347,13 @@ let
         sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
       };
     };
-    "node-red-node-serialport-0.2.1" = {
+    "node-red-node-serialport-0.4.0" = {
       name = "node-red-node-serialport";
       packageName = "node-red-node-serialport";
-      version = "0.2.1";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.2.1.tgz";
-        sha1 = "5f1f1d674558be9ed2b782e7c696d80f377e5701";
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
+        sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
       };
     };
     "bcrypt-0.8.7" = {
@@ -13464,31 +13365,130 @@ let
         sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
-    "css-select-1.0.0" = {
+    "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
-      version = "1.0.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz";
-        sha1 = "b1121ca51848dd264e2244d058cee254deeb44b0";
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-what-1.0.0" = {
+    "htmlparser2-3.9.2" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
+      };
+    };
+    "lodash.assignin-4.2.0" = {
+      name = "lodash.assignin";
+      packageName = "lodash.assignin";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz";
+        sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
+      };
+    };
+    "lodash.bind-4.2.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
+        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
+      };
+    };
+    "lodash.defaults-4.2.0" = {
+      name = "lodash.defaults";
+      packageName = "lodash.defaults";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+      };
+    };
+    "lodash.filter-4.6.0" = {
+      name = "lodash.filter";
+      packageName = "lodash.filter";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz";
+        sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace";
+      };
+    };
+    "lodash.flatten-4.4.0" = {
+      name = "lodash.flatten";
+      packageName = "lodash.flatten";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+      };
+    };
+    "lodash.foreach-4.5.0" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz";
+        sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
+      };
+    };
+    "lodash.map-4.6.0" = {
+      name = "lodash.map";
+      packageName = "lodash.map";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz";
+        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+      };
+    };
+    "lodash.merge-4.6.0" = {
+      name = "lodash.merge";
+      packageName = "lodash.merge";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz";
+        sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5";
+      };
+    };
+    "lodash.reduce-4.6.0" = {
+      name = "lodash.reduce";
+      packageName = "lodash.reduce";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
+        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
+      };
+    };
+    "lodash.reject-4.6.0" = {
+      name = "lodash.reject";
+      packageName = "lodash.reject";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
+        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
+      };
+    };
+    "lodash.some-4.6.0" = {
+      name = "lodash.some";
+      packageName = "lodash.some";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
+        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+      };
+    };
+    "css-what-2.1.0" = {
       name = "css-what";
       packageName = "css-what";
-      version = "1.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz";
-        sha1 = "d7cc2df45180666f99d2b14462639469e00f736c";
-      };
-    };
-    "domutils-1.4.3" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
-        sha1 = "0865513796c6b306031850e175516baf80b72a6f";
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz";
+        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
       };
     };
     "boolbase-1.0.0" = {
@@ -13509,13 +13509,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.3.1" = {
+    "moment-timezone-0.5.7" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.3.1";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.3.1.tgz";
-        sha1 = "3ef47856b02d53b718a10a5ec2023aa299e07bf5";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
+        sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
       };
     };
     "retry-0.6.1" = {
@@ -13572,13 +13572,13 @@ let
         sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
       };
     };
-    "help-me-0.1.0" = {
+    "help-me-1.0.1" = {
       name = "help-me";
       packageName = "help-me";
-      version = "0.1.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-0.1.0.tgz";
-        sha1 = "0fb3a40537ad5265b6b49413022c60d35b49539a";
+        url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz";
+        sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
     "mqtt-connection-2.1.1" = {
@@ -13635,6 +13635,15 @@ let
         sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
+    "callback-stream-1.1.0" = {
+      name = "callback-stream";
+      packageName = "callback-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
+        sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
+      };
+    };
     "reduplexer-1.1.0" = {
       name = "reduplexer";
       packageName = "reduplexer";
@@ -13698,15 +13707,6 @@ let
         sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
       };
     };
-    "request-2.65.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.65.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.65.0.tgz";
-        sha1 = "cc1a3bc72b96254734fc34296da322f9486ddeba";
-      };
-    };
     "sax-0.6.1" = {
       name = "sax";
       packageName = "sax";
@@ -13734,42 +13734,6 @@ let
         sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
       };
     };
-    "bl-1.0.3" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
-        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
-      };
-    };
-    "qs-5.2.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "5.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
-        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
-      };
-    };
-    "tough-cookie-2.2.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
-        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
-      };
-    };
-    "http-signature-0.11.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
-        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
-      };
-    };
     "nodemailer-1.11.0" = {
       name = "nodemailer";
       packageName = "nodemailer";
@@ -13959,31 +13923,22 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-2.1.2" = {
+    "serialport-4.0.4" = {
       name = "serialport";
       packageName = "serialport";
-      version = "2.1.2";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-2.1.2.tgz";
-        sha1 = "493af176ac59043e7da5f2d7978fa30d1a8cb353";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.4.tgz";
+        sha1 = "93e55ad75e0451fcdeabb939c08da01da138a74a";
       };
     };
-    "nan-2.2.1" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.2.1";
+    "lie-3.1.0" = {
+      name = "lie";
+      packageName = "lie";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz";
-        sha1 = "d68693f6b34bb41d66bc68b3a4f9defc79d7149b";
-      };
-    };
-    "node-pre-gyp-github-1.3.1" = {
-      name = "node-pre-gyp-github";
-      packageName = "node-pre-gyp-github";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.3.1.tgz";
-        sha1 = "c6965303995b5b083eca64a1aa35fd2b511dcbb3";
+        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
+        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
       };
     };
     "object.assign-4.0.4" = {
@@ -13995,22 +13950,13 @@ let
         sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
       };
     };
-    "sf-0.1.7" = {
-      name = "sf";
-      packageName = "sf";
-      version = "0.1.7";
+    "immediate-3.0.6" = {
+      name = "immediate";
+      packageName = "immediate";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sf/-/sf-0.1.7.tgz";
-        sha1 = "806ed032d7225c7fb6394b0bdbfe1ea936fe6d74";
-      };
-    };
-    "github-0.2.4" = {
-      name = "github";
-      packageName = "github";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github/-/github-0.2.4.tgz";
-        sha1 = "24fa7f0e13fa11b946af91134c51982a91ce538b";
+        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
+        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
       };
     };
     "define-properties-1.1.2" = {
@@ -14697,6 +14643,15 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
+    "request-2.75.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.75.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+      };
+    };
     "unique-filename-1.1.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -14742,6 +14697,15 @@ let
         sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
+    "form-data-2.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+      };
+    };
     "unique-slug-2.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -14949,13 +14913,13 @@ let
         sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
       };
     };
-    "fast-diff-1.0.1" = {
+    "fast-diff-1.1.1" = {
       name = "fast-diff";
       packageName = "fast-diff";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.0.1.tgz";
-        sha1 = "76532d5b8e49f6770fd464658628f9ed47eb5ac8";
+        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz";
+        sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b";
       };
     };
     "node-alias-1.0.4" = {
@@ -14967,13 +14931,13 @@ let
         sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "npm-3.10.8" = {
+    "npm-3.10.9" = {
       name = "npm";
       packageName = "npm";
-      version = "3.10.8";
+      version = "3.10.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz";
-        sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e";
+        url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
+        sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
       };
     };
     "npmi-2.0.1" = {
@@ -14985,13 +14949,13 @@ let
         sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
       };
     };
-    "require-dir-0.3.0" = {
+    "require-dir-0.3.1" = {
       name = "require-dir";
       packageName = "require-dir";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.0.tgz";
-        sha1 = "89f074a85638b07c20a4fb94c93b5db635a64781";
+        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz";
+        sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a";
       };
     };
     "semver-utils-1.1.1" = {
@@ -15003,13 +14967,473 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "spawn-please-0.1.0" = {
+    "spawn-please-0.2.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.1.0.tgz";
-        sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac";
+        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz";
+        sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
+      };
+    };
+    "update-notifier-1.0.2" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
+        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+      };
+    };
+    "boxen-0.6.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
+        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+      };
+    };
+    "configstore-2.1.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
+        sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
+      };
+    };
+    "latest-version-2.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
+        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+      };
+    };
+    "lazy-req-1.1.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
+        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
+      };
+    };
+    "ansi-align-1.1.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
+        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+      };
+    };
+    "cli-boxes-1.0.0" = {
+      name = "cli-boxes";
+      packageName = "cli-boxes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+      };
+    };
+    "filled-array-1.1.0" = {
+      name = "filled-array";
+      packageName = "filled-array";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
+        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+      };
+    };
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+      };
+    };
+    "dot-prop-3.0.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
+        sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
+      };
+    };
+    "is-obj-1.0.1" = {
+      name = "is-obj";
+      packageName = "is-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    };
+    "package-json-2.4.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
+        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+      };
+    };
+    "got-5.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
+      };
+    };
+    "registry-auth-token-3.1.0" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
+        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+      };
+    };
+    "node-status-codes-1.0.0" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
+        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
+      };
+    };
+    "unzip-response-1.0.2" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
+        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+      };
+    };
+    "babybird-0.0.1" = {
+      name = "babybird";
+      packageName = "babybird";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
+        sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
+      };
+    };
+    "bunyan-1.8.4" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
+        sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
+      };
+    };
+    "connect-busboy-0.0.2" = {
+      name = "connect-busboy";
+      packageName = "connect-busboy";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+        sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
+      };
+    };
+    "core-js-1.2.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz";
+        sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "domino-1.0.27" = {
+      name = "domino";
+      packageName = "domino";
+      version = "1.0.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz";
+        sha1 = "26bc01f739707505c51456af7f59e3373369475d";
+      };
+    };
+    "express-handlebars-2.0.1" = {
+      name = "express-handlebars";
+      packageName = "express-handlebars";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz";
+        sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1";
+      };
+    };
+    "finalhandler-0.4.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+      };
+    };
+    "gelf-stream-0.2.4" = {
+      name = "gelf-stream";
+      packageName = "gelf-stream";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
+        sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
+      };
+    };
+    "html5-1.0.5" = {
+      name = "html5";
+      packageName = "html5";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
+        sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848";
+      };
+    };
+    "node-txstatsd-0.1.6" = {
+      name = "node-txstatsd";
+      packageName = "node-txstatsd";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz";
+        sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04";
+      };
+    };
+    "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = {
+      name = "pegjs";
+      packageName = "pegjs";
+      version = "0.8.0";
+      src = fetchgit {
+        url = "https://github.com/tstarling/pegjs.git";
+        rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a";
+        sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa";
+      };
+    };
+    "prfun-2.1.4" = {
+      name = "prfun";
+      packageName = "prfun";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz";
+        sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
+      };
+    };
+    "simplediff-0.1.1" = {
+      name = "simplediff";
+      packageName = "simplediff";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+        sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+      };
+    };
+    "is-arguments-1.0.2" = {
+      name = "is-arguments";
+      packageName = "is-arguments";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz";
+        sha1 = "07e30ad79531844179b642d2d8399435182c8727";
+      };
+    };
+    "dtrace-provider-0.7.1" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
+        sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
+      };
+    };
+    "mv-2.1.1" = {
+      name = "mv";
+      packageName = "mv";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
+        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
+      };
+    };
+    "safe-json-stringify-1.0.3" = {
+      name = "safe-json-stringify";
+      packageName = "safe-json-stringify";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
+        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+      };
+    };
+    "ncp-2.0.0" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
+      };
+    };
+    "rimraf-2.4.5" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+      };
+    };
+    "busboy-0.2.13" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+      };
+    };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
+    "handlebars-3.0.3" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz";
+        sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad";
+      };
+    };
+    "object.assign-1.1.1" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz";
+        sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c";
+      };
+    };
+    "uglify-js-2.3.6" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      };
+    };
+    "gelfling-0.2.0" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+        sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+      };
+    };
+    "opts-1.2.2" = {
+      name = "opts";
+      packageName = "opts";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
+        sha1 = "81782b93014a1cd88d56c226643fd4282473853d";
+      };
+    };
+    "html5-entities-1.0.0" = {
+      name = "html5-entities";
+      packageName = "html5-entities";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
+        sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370";
+      };
+    };
+    "jsdom-0.11.1" = {
+      name = "jsdom";
+      packageName = "jsdom";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
+        sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb";
+      };
+    };
+    "nwmatcher-1.3.9" = {
+      name = "nwmatcher";
+      packageName = "nwmatcher";
+      version = "1.3.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
+        sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
+      };
+    };
+    "xmlhttprequest-1.8.0" = {
+      name = "xmlhttprequest";
+      packageName = "xmlhttprequest";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
+        sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
+      };
+    };
+    "cssom-0.3.1" = {
+      name = "cssom";
+      packageName = "cssom";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz";
+        sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3";
+      };
+    };
+    "cssstyle-0.2.37" = {
+      name = "cssstyle";
+      packageName = "cssstyle";
+      version = "0.2.37";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
+        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
+      };
+    };
+    "contextify-0.1.15" = {
+      name = "contextify";
+      packageName = "contextify";
+      version = "0.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz";
+        sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f";
       };
     };
     "airplayer-2.0.0" = {
@@ -15021,6 +15445,33 @@ let
         sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259";
       };
     };
+    "clivas-0.2.0" = {
+      name = "clivas";
+      packageName = "clivas";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz";
+        sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
+      };
+    };
+    "inquirer-1.2.2" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
+        sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+      };
+    };
+    "network-address-1.1.0" = {
+      name = "network-address";
+      packageName = "network-address";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
+        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
+      };
+    };
     "airplay-protocol-2.0.2" = {
       name = "airplay-protocol";
       packageName = "airplay-protocol";
@@ -15192,6 +15643,60 @@ let
         sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
       };
     };
+    "external-editor-1.1.1" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
+        sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
+      };
+    };
+    "run-async-2.2.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
+        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+      };
+    };
+    "rx-4.1.0" = {
+      name = "rx";
+      packageName = "rx";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+      };
+    };
+    "spawn-sync-1.0.15" = {
+      name = "spawn-sync";
+      packageName = "spawn-sync";
+      version = "1.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz";
+        sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
+      };
+    };
+    "tmp-0.0.29" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz";
+        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
+      };
+    };
+    "os-shim-0.1.3" = {
+      name = "os-shim";
+      packageName = "os-shim";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz";
+        sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917";
+      };
+    };
     "connect-multiparty-1.2.5" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
@@ -15660,15 +16165,6 @@ let
         sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d";
       };
     };
-    "network-address-1.1.0" = {
-      name = "network-address";
-      packageName = "network-address";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
-        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
-      };
-    };
     "simple-get-1.4.3" = {
       name = "simple-get";
       packageName = "simple-get";
@@ -15822,6 +16318,33 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
+    "bl-1.0.3" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
+        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
+      };
+    };
+    "qs-5.2.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
+        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
+      };
+    };
+    "tough-cookie-2.2.2" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
+        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
+      };
+    };
     "throttleit-1.0.0" = {
       name = "throttleit";
       packageName = "throttleit";
@@ -16192,15 +16715,6 @@ let
         sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
       };
     };
-    "bunyan-1.8.1" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz";
-        sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f";
-      };
-    };
     "handlebars-2.0.0" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -16219,13 +16733,13 @@ let
         sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
       };
     };
-    "lunr-0.7.1" = {
+    "lunr-0.7.2" = {
       name = "lunr";
       packageName = "lunr";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.1.tgz";
-        sha1 = "b5a2cff99555b7893f5f1a4a17af3f638373c4bb";
+        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
+        sha1 = "79a30e932e216cba163541ee37a3607c12cd7281";
       };
     };
     "render-readme-1.3.1" = {
@@ -16345,60 +16859,6 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "dtrace-provider-0.6.0" = {
-      name = "dtrace-provider";
-      packageName = "dtrace-provider";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
-        sha1 = "0b078d5517937d873101452d9146737557b75e51";
-      };
-    };
-    "mv-2.1.1" = {
-      name = "mv";
-      packageName = "mv";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
-        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
-      };
-    };
-    "safe-json-stringify-1.0.3" = {
-      name = "safe-json-stringify";
-      packageName = "safe-json-stringify";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
-        sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
-      };
-    };
-    "ncp-2.0.0" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
-        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
-      };
-    };
-    "rimraf-2.4.5" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.4.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
-        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
-      };
-    };
-    "uglify-js-2.3.6" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
-        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
-      };
-    };
     "markdown-it-4.4.0" = {
       name = "markdown-it";
       packageName = "markdown-it";
@@ -16444,15 +16904,6 @@ let
         sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
       };
     };
-    "htmlparser2-3.9.1" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz";
-        sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2";
-      };
-    };
     "regexp-quote-0.0.0" = {
       name = "regexp-quote";
       packageName = "regexp-quote";
@@ -16570,6 +17021,15 @@ let
         sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
+    "http-signature-0.11.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+      };
+    };
     "keep-alive-agent-0.0.1" = {
       name = "keep-alive-agent";
       packageName = "keep-alive-agent";
@@ -16606,6 +17066,15 @@ let
         sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94";
       };
     };
+    "dtrace-provider-0.6.0" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
+        sha1 = "0b078d5517937d873101452d9146737557b75e51";
+      };
+    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -17020,13 +17489,13 @@ let
         sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
       };
     };
-    "color-0.11.3" = {
+    "color-0.11.4" = {
       name = "color";
       packageName = "color";
-      version = "0.11.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz";
-        sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6";
+        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
       };
     };
     "crossroads-0.12.2" = {
@@ -17209,13 +17678,13 @@ let
         sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
       };
     };
-    "color-convert-1.5.0" = {
+    "color-convert-1.6.0" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz";
-        sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.6.0.tgz";
+        sha1 = "7592755faf53938a05b1ea8e5374cab77d6dd190";
       };
     };
     "color-string-0.3.0" = {
@@ -17254,15 +17723,6 @@ let
         sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
       };
     };
-    "finalhandler-0.4.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
-      };
-    };
     "send-0.13.1" = {
       name = "send";
       packageName = "send";
@@ -17389,13 +17849,13 @@ let
         sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
       };
     };
-    "editions-1.1.2" = {
+    "editions-1.3.1" = {
       name = "editions";
       packageName = "editions";
-      version = "1.1.2";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-1.1.2.tgz";
-        sha1 = "8cdf0cb39eafc564149181ca37c8272e98b16eab";
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
+        sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
       };
     };
     "typechecker-4.3.0" = {
@@ -17677,13 +18137,13 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.29" = {
+    "tmp-0.0.30" = {
       name = "tmp";
       packageName = "tmp";
-      version = "0.0.29";
+      version = "0.0.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz";
-        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz";
+        sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -17749,15 +18209,6 @@ let
         sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
       };
     };
-    "uglify-js-2.6.4" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.4.tgz";
-        sha1 = "65ea2fb3059c9394692f15fed87c2b36c16b9adf";
-      };
-    };
     "watchpack-0.2.9" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -17794,13 +18245,13 @@ let
         sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978";
       };
     };
-    "emojis-list-2.0.1" = {
+    "emojis-list-2.1.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.0.1.tgz";
-        sha1 = "a174d9d0838eb36af3d0590bb6d3e8dcd94f4fbd";
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
     "json5-0.5.0" = {
@@ -17821,6 +18272,15 @@ let
         sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
+    "constants-browserify-0.0.1" = {
+      name = "constants-browserify";
+      packageName = "constants-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+      };
+    };
     "crypto-browserify-3.2.8" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
@@ -17830,6 +18290,15 @@ let
         sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
       };
     };
+    "http-browserify-1.7.0" = {
+      name = "http-browserify";
+      packageName = "http-browserify";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+      };
+    };
     "https-browserify-0.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
@@ -17839,6 +18308,24 @@ let
         sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
       };
     };
+    "stream-browserify-1.0.0" = {
+      name = "stream-browserify";
+      packageName = "stream-browserify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
+      };
+    };
+    "url-0.10.3" = {
+      name = "url";
+      packageName = "url";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
+        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
+      };
+    };
     "pbkdf2-compat-2.0.1" = {
       name = "pbkdf2-compat";
       packageName = "pbkdf2-compat";
@@ -17866,6 +18353,15 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
+    "Base64-0.2.1" = {
+      name = "Base64";
+      packageName = "Base64";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+      };
+    };
     "source-list-map-0.1.6" = {
       name = "source-list-map";
       packageName = "source-list-map";
@@ -17881,10 +18377,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.2";
+    version = "1.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz";
-      sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
+      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -17915,7 +18411,7 @@ in
           sources."async-0.2.10"
           (sources."source-map-0.1.34" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
           (sources."optimist-0.3.7" // {
@@ -17956,7 +18452,7 @@ in
       })
       (sources."source-map-0.1.9" // {
         dependencies = [
-          sources."amdefine-1.0.0"
+          sources."amdefine-1.0.1"
         ];
       })
       (sources."xml2tss-0.0.5" // {
@@ -17986,10 +18482,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.5";
+    version = "0.10.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz";
-      sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
+      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18045,7 +18541,7 @@ in
                   sources."buffer-equal-constant-time-1.0.1"
                   (sources."ecdsa-sig-formatter-1.0.7" // {
                     dependencies = [
-                      sources."base64-url-1.3.2"
+                      sources."base64-url-1.3.3"
                     ];
                   })
                 ];
@@ -18073,25 +18569,25 @@ in
       })
       sources."azure-arm-authorization-2.0.0"
       sources."azure-arm-cdn-0.2.1"
-      sources."azure-arm-commerce-0.1.1"
+      sources."azure-arm-commerce-0.2.0"
       sources."azure-arm-compute-0.19.0"
-      sources."azure-arm-hdinsight-0.2.0"
+      sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
-      sources."azure-arm-iothub-0.1.1"
+      sources."azure-arm-iothub-0.1.4"
       sources."azure-arm-servermanagement-0.1.2"
       sources."azure-arm-network-0.17.0"
       sources."azure-arm-powerbiembedded-0.1.0"
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
-      sources."azure-arm-website-0.11.0"
+      sources."azure-arm-website-0.11.4"
       sources."azure-arm-rediscache-0.2.1"
       sources."azure-arm-datalake-analytics-0.4.3"
       sources."azure-arm-datalake-store-0.4.2"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
-      sources."azure-keyvault-0.10.2"
+      sources."azure-keyvault-0.11.0"
       sources."azure-asm-compute-0.17.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-trafficmanager-0.10.3"
@@ -18141,7 +18637,7 @@ in
           })
         ];
       })
-      sources."azure-arm-batch-0.2.0"
+      sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
       sources."applicationinsights-0.15.12"
@@ -18190,7 +18686,7 @@ in
       })
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
-      (sources."kuduscript-1.0.8" // {
+      (sources."kuduscript-1.0.9" // {
         dependencies = [
           (sources."commander-1.1.1" // {
             dependencies = [
@@ -18200,13 +18696,13 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.15.1"
-      (sources."ms-rest-1.15.0" // {
+      sources."moment-2.15.2"
+      (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
         ];
       })
-      (sources."ms-rest-azure-1.15.0" // {
+      (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
           sources."async-0.2.7"
           sources."uuid-2.0.1"
@@ -18240,10 +18736,10 @@ in
               sources."ncp-0.4.2"
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -18294,7 +18790,7 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.4.1"
+          sources."aws4-1.5.0"
           (sources."bl-1.1.2" // {
             dependencies = [
               (sources."readable-stream-2.0.6" // {
@@ -18319,9 +18815,9 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.0.1" // {
+              (sources."async-2.1.2" // {
                 dependencies = [
-                  sources."lodash-4.16.2"
+                  sources."lodash-4.16.6"
                 ];
               })
             ];
@@ -18350,7 +18846,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -18358,7 +18854,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -18414,7 +18910,11 @@ in
           sources."oauth-sign-0.8.2"
           sources."qs-6.2.1"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
@@ -18428,10 +18928,10 @@ in
         dependencies = [
           (sources."source-map-0.1.43" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
-          sources."fibers-1.0.14"
+          sources."fibers-1.0.15"
           sources."galaxy-0.1.12"
         ];
       })
@@ -18463,7 +18963,7 @@ in
                   sources."asap-2.0.5"
                 ];
               })
-              sources."qs-6.2.1"
+              sources."qs-6.3.0"
             ];
           })
         ];
@@ -18550,7 +19050,7 @@ in
                 dependencies = [
                   (sources."got-2.9.2" // {
                     dependencies = [
-                      (sources."duplexify-3.4.5" // {
+                      (sources."duplexify-3.5.0" // {
                         dependencies = [
                           (sources."end-of-stream-1.0.0" // {
                             dependencies = [
@@ -18641,7 +19141,7 @@ in
                               sources."spdx-license-ids-1.2.2"
                             ];
                           })
-                          sources."spdx-expression-parse-1.0.3"
+                          sources."spdx-expression-parse-1.0.4"
                         ];
                       })
                     ];
@@ -18663,7 +19163,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -18688,7 +19188,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -18748,16 +19248,16 @@ in
       sources."bower-logger-0.2.1"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."jsonfile-2.4.0"
-          sources."klaw-1.3.0"
+          sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -18809,7 +19309,7 @@ in
       })
       (sources."glob-6.0.4" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -18845,10 +19345,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.0";
+    version = "13.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
-      sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
+      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
     };
     dependencies = [
       (sources."JSONStream-1.2.1" // {
@@ -18880,10 +19380,11 @@ in
       (sources."buffer-4.9.1" // {
         dependencies = [
           sources."base64-js-1.2.0"
-          sources."ieee754-1.1.6"
+          sources."ieee754-1.1.8"
           sources."isarray-1.0.0"
         ];
       })
+      sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."typedarray-0.0.6"
@@ -18983,7 +19484,7 @@ in
               })
             ];
           })
-          sources."pbkdf2-3.0.8"
+          sources."pbkdf2-3.0.9"
           (sources."public-encrypt-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
@@ -19016,7 +19517,7 @@ in
       sources."events-1.1.1"
       (sources."glob-5.0.15" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -19075,11 +19576,11 @@ in
           sources."stream-splicer-2.0.0"
         ];
       })
-      (sources."module-deps-4.0.7" // {
+      (sources."module-deps-4.0.8" // {
         dependencies = [
-          (sources."detective-4.3.1" // {
+          (sources."detective-4.3.2" // {
             dependencies = [
-              sources."acorn-1.2.2"
+              sources."acorn-3.3.0"
             ];
           })
           sources."stream-combiner2-1.1.1"
@@ -19125,7 +19626,7 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.4.0" // {
+      (sources."stream-http-2.4.1" // {
         dependencies = [
           sources."builtin-status-codes-2.0.0"
           sources."to-arraybuffer-1.0.1"
@@ -19309,7 +19810,7 @@ in
                           sources."spdx-license-ids-1.2.2"
                         ];
                       })
-                      sources."spdx-expression-parse-1.0.3"
+                      sources."spdx-expression-parse-1.0.4"
                     ];
                   })
                 ];
@@ -19331,7 +19832,7 @@ in
                     dependencies = [
                       (sources."load-json-file-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
                               (sources."error-ex-1.3.0" // {
@@ -19356,7 +19857,7 @@ in
                       })
                       (sources."path-type-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                           sources."pify-2.3.0"
                           (sources."pinkie-promise-2.0.1" // {
                             dependencies = [
@@ -19474,14 +19975,15 @@ in
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."simple-get-2.2.3" // {
+              (sources."simple-get-2.3.0" // {
                 dependencies = [
                   (sources."once-1.4.0" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  sources."unzip-response-1.0.1"
+                  sources."simple-concat-1.0.0"
+                  sources."unzip-response-2.0.1"
                 ];
               })
             ];
@@ -19542,7 +20044,7 @@ in
               sources."immediate-chunk-store-1.0.8"
               (sources."ip-set-1.0.1" // {
                 dependencies = [
-                  sources."ip-1.1.3"
+                  sources."ip-1.1.4"
                 ];
               })
               sources."mkdirp-0.3.5"
@@ -19597,10 +20099,10 @@ in
               })
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -19664,7 +20166,7 @@ in
                           sources."ipaddr.js-1.2.0"
                         ];
                       })
-                      sources."ip-1.1.3"
+                      sources."ip-1.1.4"
                       (sources."once-1.4.0" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
@@ -19672,9 +20174,10 @@ in
                       })
                       sources."random-iterate-1.0.1"
                       sources."run-series-1.1.4"
-                      (sources."simple-get-2.2.3" // {
+                      (sources."simple-get-2.3.0" // {
                         dependencies = [
-                          sources."unzip-response-1.0.1"
+                          sources."simple-concat-1.0.0"
+                          sources."unzip-response-2.0.1"
                         ];
                       })
                       (sources."simple-peer-6.0.7" // {
@@ -19839,7 +20342,7 @@ in
                   })
                 ];
               })
-              sources."exit-on-epipe-0.0.1"
+              sources."exit-on-epipe-0.1.0"
               (sources."commander-2.9.0" // {
                 dependencies = [
                   sources."graceful-readlink-1.0.1"
@@ -19856,7 +20359,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.2"
+              sources."lodash-4.16.6"
             ];
           })
         ];
@@ -19874,10 +20377,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.0";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz";
-      sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19890,13 +20393,78 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "6.3.1";
+    version = "6.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-6.3.1.tgz";
-      sha1 = "0513fa5c0aee5be63c853b214cfb83382a2f8c61";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz";
+      sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776";
     };
     dependencies = [
-      (sources."cordova-lib-6.3.1" // {
+      (sources."cordova-common-1.5.1" // {
+        dependencies = [
+          sources."ansi-0.3.1"
+          (sources."bplist-parser-0.1.1" // {
+            dependencies = [
+              sources."big-integer-1.6.16"
+            ];
+          })
+          sources."cordova-registry-mapper-1.1.15"
+          (sources."elementtree-0.1.6" // {
+            dependencies = [
+              sources."sax-0.3.5"
+            ];
+          })
+          (sources."glob-5.0.15" // {
+            dependencies = [
+              (sources."inflight-1.0.6" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."inherits-2.0.3"
+              (sources."once-1.4.0" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+          (sources."minimatch-3.0.3" // {
+            dependencies = [
+              (sources."brace-expansion-1.1.6" // {
+                dependencies = [
+                  sources."balanced-match-0.4.2"
+                  sources."concat-map-0.0.1"
+                ];
+              })
+            ];
+          })
+          (sources."osenv-0.1.3" // {
+            dependencies = [
+              sources."os-homedir-1.0.2"
+              sources."os-tmpdir-1.0.2"
+            ];
+          })
+          (sources."plist-1.2.0" // {
+            dependencies = [
+              sources."base64-js-0.0.8"
+              (sources."xmlbuilder-4.0.0" // {
+                dependencies = [
+                  sources."lodash-3.10.1"
+                ];
+              })
+              sources."xmldom-0.1.22"
+              sources."util-deprecate-1.0.2"
+            ];
+          })
+          sources."q-1.4.1"
+          sources."semver-5.3.0"
+          sources."shelljs-0.5.3"
+          sources."underscore-1.8.3"
+          sources."unorm-1.4.1"
+        ];
+      })
+      (sources."cordova-lib-6.4.0" // {
         dependencies = [
           (sources."aliasify-1.9.0" // {
             dependencies = [
@@ -19915,18 +20483,17 @@ in
               })
             ];
           })
-          sources."cordova-app-hello-world-3.10.0"
           (sources."cordova-fetch-1.0.1" // {
             dependencies = [
               sources."dependency-ls-1.0.0"
               sources."is-url-1.2.2"
               sources."q-1.4.1"
-              (sources."shelljs-0.7.4" // {
+              (sources."shelljs-0.7.5" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -19960,9 +20527,14 @@ in
               })
             ];
           })
-          (sources."cordova-js-4.1.4" // {
+          (sources."cordova-create-1.0.1" // {
             dependencies = [
-              (sources."browserify-10.1.3" // {
+              sources."cordova-app-hello-world-3.11.0"
+            ];
+          })
+          (sources."cordova-js-4.2.0" // {
+            dependencies = [
+              (sources."browserify-13.1.0" // {
                 dependencies = [
                   (sources."JSONStream-1.2.1" // {
                     dependencies = [
@@ -19971,35 +20543,14 @@ in
                     ];
                   })
                   sources."assert-1.3.0"
-                  (sources."browser-pack-4.0.4" // {
+                  (sources."browser-pack-6.0.1" // {
                     dependencies = [
-                      (sources."combine-source-map-0.3.0" // {
+                      (sources."combine-source-map-0.7.2" // {
                         dependencies = [
-                          (sources."inline-source-map-0.3.1" // {
-                            dependencies = [
-                              (sources."source-map-0.3.0" // {
-                                dependencies = [
-                                  sources."amdefine-1.0.0"
-                                ];
-                              })
-                            ];
-                          })
-                          sources."convert-source-map-0.3.5"
-                          (sources."source-map-0.1.43" // {
-                            dependencies = [
-                              sources."amdefine-1.0.0"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."through2-0.5.1" // {
-                        dependencies = [
-                          (sources."readable-stream-1.0.34" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                            ];
-                          })
-                          sources."xtend-3.0.0"
+                          sources."convert-source-map-1.1.3"
+                          sources."inline-source-map-0.6.2"
+                          sources."lodash.memoize-3.0.4"
+                          sources."source-map-0.5.6"
                         ];
                       })
                       sources."umd-3.0.1"
@@ -20011,18 +20562,24 @@ in
                       sources."pako-0.2.9"
                     ];
                   })
-                  (sources."buffer-3.6.0" // {
+                  (sources."buffer-4.9.1" // {
                     dependencies = [
-                      sources."base64-js-0.0.8"
-                      sources."ieee754-1.1.6"
+                      sources."base64-js-1.2.0"
+                      sources."ieee754-1.1.8"
                       sources."isarray-1.0.0"
                     ];
                   })
-                  sources."builtins-0.0.7"
-                  sources."commondir-0.0.1"
-                  (sources."concat-stream-1.4.10" // {
+                  (sources."concat-stream-1.5.2" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
+                      (sources."readable-stream-2.0.6" // {
+                        dependencies = [
+                          sources."core-util-is-1.0.2"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
                     ];
                   })
                   (sources."console-browserify-1.1.0" // {
@@ -20030,7 +20587,7 @@ in
                       sources."date-now-0.1.4"
                     ];
                   })
-                  sources."constants-browserify-0.0.1"
+                  sources."constants-browserify-1.0.0"
                   (sources."crypto-browserify-3.11.0" // {
                     dependencies = [
                       (sources."browserify-cipher-1.0.0" // {
@@ -20111,7 +20668,7 @@ in
                           })
                         ];
                       })
-                      sources."pbkdf2-3.0.8"
+                      sources."pbkdf2-3.0.9"
                       (sources."public-encrypt-4.0.0" // {
                         dependencies = [
                           sources."bn.js-4.11.6"
@@ -20137,61 +20694,27 @@ in
                       sources."randombytes-2.0.3"
                     ];
                   })
-                  sources."deep-equal-1.0.1"
                   sources."defined-1.0.0"
-                  sources."deps-sort-1.3.9"
+                  sources."deps-sort-2.0.0"
                   sources."domain-browser-1.1.7"
-                  sources."duplexer2-0.0.2"
-                  sources."events-1.0.2"
-                  (sources."glob-4.5.3" // {
-                    dependencies = [
-                      (sources."inflight-1.0.5" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      (sources."minimatch-2.0.10" // {
-                        dependencies = [
-                          (sources."brace-expansion-1.1.6" // {
-                            dependencies = [
-                              sources."balanced-match-0.4.2"
-                              sources."concat-map-0.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."once-1.4.0" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."duplexer2-0.1.4"
+                  sources."events-1.1.1"
                   (sources."has-1.0.1" // {
                     dependencies = [
                       sources."function-bind-1.1.0"
                     ];
                   })
                   sources."htmlescape-1.1.1"
-                  (sources."http-browserify-1.7.0" // {
-                    dependencies = [
-                      sources."Base64-0.2.1"
-                    ];
-                  })
                   sources."https-browserify-0.0.1"
                   sources."inherits-2.0.3"
-                  (sources."insert-module-globals-6.6.3" // {
+                  (sources."insert-module-globals-7.0.1" // {
                     dependencies = [
-                      (sources."combine-source-map-0.6.1" // {
+                      (sources."combine-source-map-0.7.2" // {
                         dependencies = [
                           sources."convert-source-map-1.1.3"
-                          sources."inline-source-map-0.5.0"
+                          sources."inline-source-map-0.6.2"
                           sources."lodash.memoize-3.0.4"
-                          (sources."source-map-0.4.4" // {
-                            dependencies = [
-                              sources."amdefine-1.0.0"
-                            ];
-                          })
+                          sources."source-map-0.5.6"
                         ];
                       })
                       sources."is-buffer-1.1.4"
@@ -20206,38 +20729,21 @@ in
                       })
                     ];
                   })
-                  sources."isarray-0.0.1"
-                  (sources."labeled-stream-splicer-1.0.2" // {
+                  (sources."labeled-stream-splicer-2.0.0" // {
                     dependencies = [
-                      (sources."stream-splicer-1.3.2" // {
-                        dependencies = [
-                          sources."readable-wrap-1.0.0"
-                          sources."indexof-0.0.1"
-                        ];
-                      })
+                      sources."isarray-0.0.1"
+                      sources."stream-splicer-2.0.0"
                     ];
                   })
-                  (sources."module-deps-3.9.1" // {
+                  (sources."module-deps-4.0.8" // {
                     dependencies = [
-                      (sources."detective-4.3.1" // {
+                      sources."cached-path-relative-1.0.0"
+                      (sources."detective-4.3.2" // {
                         dependencies = [
-                          sources."acorn-1.2.2"
-                        ];
-                      })
-                      (sources."stream-combiner2-1.0.2" // {
-                        dependencies = [
-                          (sources."through2-0.5.1" // {
-                            dependencies = [
-                              (sources."readable-stream-1.0.34" // {
-                                dependencies = [
-                                  sources."core-util-is-1.0.2"
-                                ];
-                              })
-                              sources."xtend-3.0.0"
-                            ];
-                          })
+                          sources."acorn-3.3.0"
                         ];
                       })
+                      sources."stream-combiner2-1.1.1"
                     ];
                   })
                   sources."os-browserify-0.1.2"
@@ -20250,18 +20756,17 @@ in
                   sources."process-0.11.9"
                   sources."punycode-1.4.1"
                   sources."querystring-es3-0.2.1"
-                  (sources."read-only-stream-1.1.1" // {
-                    dependencies = [
-                      sources."readable-wrap-1.0.0"
-                    ];
-                  })
-                  (sources."readable-stream-1.1.14" // {
+                  sources."read-only-stream-2.0.0"
+                  (sources."readable-stream-2.1.5" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."process-nextick-args-1.0.7"
+                      sources."util-deprecate-1.0.2"
                     ];
                   })
                   sources."resolve-1.1.7"
-                  sources."shallow-copy-0.0.1"
                   (sources."shasum-1.0.2" // {
                     dependencies = [
                       (sources."json-stable-stringify-0.0.1" // {
@@ -20272,8 +20777,21 @@ in
                       sources."sha.js-2.4.5"
                     ];
                   })
-                  sources."shell-quote-0.0.1"
-                  sources."stream-browserify-1.0.0"
+                  (sources."shell-quote-1.6.1" // {
+                    dependencies = [
+                      sources."jsonify-0.0.0"
+                      sources."array-filter-0.0.1"
+                      sources."array-reduce-0.0.0"
+                      sources."array-map-0.0.0"
+                    ];
+                  })
+                  sources."stream-browserify-2.0.1"
+                  (sources."stream-http-2.4.1" // {
+                    dependencies = [
+                      sources."builtin-status-codes-2.0.0"
+                      sources."to-arraybuffer-1.0.1"
+                    ];
+                  })
                   sources."string_decoder-0.10.31"
                   (sources."subarg-1.0.0" // {
                     dependencies = [
@@ -20285,10 +20803,21 @@ in
                       sources."acorn-2.7.0"
                     ];
                   })
-                  sources."through2-1.1.1"
+                  (sources."through2-2.0.1" // {
+                    dependencies = [
+                      (sources."readable-stream-2.0.6" // {
+                        dependencies = [
+                          sources."core-util-is-1.0.2"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
                   sources."timers-browserify-1.4.2"
                   sources."tty-browserify-0.0.0"
-                  (sources."url-0.10.3" // {
+                  (sources."url-0.11.0" // {
                     dependencies = [
                       sources."punycode-1.3.2"
                       sources."querystring-0.2.0"
@@ -20342,7 +20871,7 @@ in
                     ];
                   })
                   sources."bytes-2.3.0"
-                  (sources."compressible-2.0.8" // {
+                  (sources."compressible-2.0.9" // {
                     dependencies = [
                       sources."mime-db-1.24.0"
                     ];
@@ -20450,7 +20979,7 @@ in
           })
           (sources."glob-5.0.15" // {
             dependencies = [
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -20478,7 +21007,7 @@ in
             dependencies = [
               (sources."glob-6.0.4" // {
                 dependencies = [
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -20531,7 +21060,7 @@ in
                       })
                     ];
                   })
-                  sources."graceful-fs-4.1.9"
+                  sources."graceful-fs-4.1.10"
                 ];
               })
               (sources."validate-npm-package-license-3.0.1" // {
@@ -20541,7 +21070,7 @@ in
                       sources."spdx-license-ids-1.2.2"
                     ];
                   })
-                  sources."spdx-expression-parse-1.0.3"
+                  sources."spdx-expression-parse-1.0.4"
                 ];
               })
               (sources."validate-npm-package-name-2.2.2" // {
@@ -20582,7 +21111,7 @@ in
                   })
                 ];
               })
-              (sources."config-chain-1.1.10" // {
+              (sources."config-chain-1.1.11" // {
                 dependencies = [
                   sources."proto-list-1.2.4"
                 ];
@@ -20613,9 +21142,9 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               sources."hosted-git-info-2.1.5"
-              sources."inflight-1.0.5"
+              sources."inflight-1.0.6"
               sources."inherits-2.0.3"
               sources."ini-1.3.4"
               sources."lockfile-1.0.2"
@@ -20764,7 +21293,7 @@ in
               (sources."request-2.74.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.4.1"
+                  sources."aws4-1.5.0"
                   (sources."bl-1.1.2" // {
                     dependencies = [
                       (sources."readable-stream-2.0.6" // {
@@ -20788,9 +21317,9 @@ in
                   sources."forever-agent-0.6.1"
                   (sources."form-data-1.0.1" // {
                     dependencies = [
-                      (sources."async-2.0.1" // {
+                      (sources."async-2.1.2" // {
                         dependencies = [
-                          sources."lodash-4.16.2"
+                          sources."lodash-4.16.6"
                         ];
                       })
                     ];
@@ -20810,7 +21339,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.14.0" // {
+                      (sources."is-my-json-valid-2.15.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -20818,7 +21347,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-2.0.0"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -20874,7 +21403,11 @@ in
                   sources."oauth-sign-0.8.2"
                   sources."qs-6.2.1"
                   sources."stringstream-0.0.5"
-                  sources."tough-cookie-2.3.1"
+                  (sources."tough-cookie-2.3.2" // {
+                    dependencies = [
+                      sources."punycode-1.4.1"
+                    ];
+                  })
                   sources."tunnel-agent-0.4.3"
                 ];
               })
@@ -20893,7 +21426,7 @@ in
               (sources."validate-npm-package-license-3.0.1" // {
                 dependencies = [
                   sources."spdx-correct-1.0.2"
-                  sources."spdx-expression-parse-1.0.3"
+                  sources."spdx-expression-parse-1.0.4"
                 ];
               })
               (sources."validate-npm-package-name-2.2.2" // {
@@ -20953,7 +21486,11 @@ in
               sources."node-uuid-1.4.7"
               sources."qs-2.3.3"
               sources."tunnel-agent-0.4.3"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               (sources."http-signature-0.10.1" // {
                 dependencies = [
                   sources."assert-plus-0.1.5"
@@ -20986,7 +21523,7 @@ in
               sources."block-stream-0.0.9"
               (sources."fstream-1.0.10" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.9"
+                  sources."graceful-fs-4.1.10"
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
                       sources."minimist-0.0.8"
@@ -20994,10 +21531,10 @@ in
                   })
                   (sources."rimraf-2.5.4" // {
                     dependencies = [
-                      (sources."glob-7.1.0" // {
+                      (sources."glob-7.1.1" // {
                         dependencies = [
                           sources."fs.realpath-1.0.0"
-                          (sources."inflight-1.0.5" // {
+                          (sources."inflight-1.0.6" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
                             ];
@@ -21047,77 +21584,224 @@ in
           })
         ];
       })
-      (sources."cordova-common-1.4.1" // {
+      (sources."insight-0.8.3" // {
         dependencies = [
-          sources."ansi-0.3.1"
-          (sources."bplist-parser-0.1.1" // {
+          sources."async-1.5.2"
+          (sources."chalk-1.1.3" // {
             dependencies = [
-              sources."big-integer-1.6.16"
-            ];
-          })
-          sources."cordova-registry-mapper-1.1.15"
-          (sources."elementtree-0.1.6" // {
-            dependencies = [
-              sources."sax-0.3.5"
-            ];
-          })
-          (sources."glob-5.0.15" // {
-            dependencies = [
-              (sources."inflight-1.0.5" // {
+              sources."ansi-styles-2.2.1"
+              sources."escape-string-regexp-1.0.5"
+              (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."wrappy-1.0.2"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
-              sources."inherits-2.0.3"
-              (sources."once-1.4.0" // {
+              (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."wrappy-1.0.2"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
-              sources."path-is-absolute-1.0.1"
+              sources."supports-color-2.0.0"
             ];
           })
-          (sources."minimatch-3.0.3" // {
+          (sources."configstore-1.4.0" // {
             dependencies = [
-              (sources."brace-expansion-1.1.6" // {
+              sources."graceful-fs-4.1.10"
+              (sources."mkdirp-0.5.1" // {
                 dependencies = [
-                  sources."balanced-match-0.4.2"
-                  sources."concat-map-0.0.1"
+                  sources."minimist-0.0.8"
                 ];
               })
-            ];
-          })
-          (sources."osenv-0.1.3" // {
-            dependencies = [
-              sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
-            ];
-          })
-          (sources."plist-1.2.0" // {
-            dependencies = [
-              sources."base64-js-0.0.8"
-              (sources."xmlbuilder-4.0.0" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
-                  sources."lodash-3.10.1"
+                  sources."os-homedir-1.0.2"
+                ];
+              })
+              sources."uuid-2.0.3"
+              (sources."write-file-atomic-1.2.0" // {
+                dependencies = [
+                  sources."imurmurhash-0.1.4"
+                  sources."slide-1.1.6"
+                ];
+              })
+              (sources."xdg-basedir-2.0.0" // {
+                dependencies = [
+                  sources."os-homedir-1.0.2"
                 ];
               })
-              sources."xmldom-0.1.22"
-              sources."util-deprecate-1.0.2"
             ];
           })
-          sources."q-1.4.1"
-          sources."semver-5.3.0"
-          sources."shelljs-0.5.3"
-          sources."underscore-1.8.3"
-          sources."unorm-1.4.1"
+          (sources."inquirer-0.10.1" // {
+            dependencies = [
+              sources."ansi-escapes-1.4.0"
+              sources."ansi-regex-2.0.0"
+              (sources."cli-cursor-1.0.2" // {
+                dependencies = [
+                  (sources."restore-cursor-1.0.1" // {
+                    dependencies = [
+                      sources."exit-hook-1.1.1"
+                      sources."onetime-1.1.0"
+                    ];
+                  })
+                ];
+              })
+              sources."cli-width-1.1.1"
+              (sources."figures-1.7.0" // {
+                dependencies = [
+                  sources."escape-string-regexp-1.0.5"
+                ];
+              })
+              sources."lodash-3.10.1"
+              (sources."readline2-1.0.1" // {
+                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."mute-stream-0.0.5"
+                ];
+              })
+              (sources."run-async-0.1.0" // {
+                dependencies = [
+                  (sources."once-1.4.0" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."rx-lite-3.1.2"
+              sources."strip-ansi-3.0.1"
+              sources."through-2.3.8"
+            ];
+          })
+          (sources."lodash.debounce-3.1.1" // {
+            dependencies = [
+              sources."lodash._getnative-3.9.1"
+            ];
+          })
+          sources."node-uuid-1.4.7"
+          sources."object-assign-4.1.0"
+          (sources."os-name-1.0.3" // {
+            dependencies = [
+              (sources."osx-release-1.1.0" // {
+                dependencies = [
+                  sources."minimist-1.2.0"
+                ];
+              })
+              (sources."win-release-1.1.1" // {
+                dependencies = [
+                  sources."semver-5.3.0"
+                ];
+              })
+            ];
+          })
+          (sources."request-2.78.0" // {
+            dependencies = [
+              sources."aws-sign2-0.6.0"
+              sources."aws4-1.5.0"
+              sources."caseless-0.11.0"
+              (sources."combined-stream-1.0.5" // {
+                dependencies = [
+                  sources."delayed-stream-1.0.0"
+                ];
+              })
+              sources."extend-3.0.0"
+              sources."forever-agent-0.6.1"
+              (sources."form-data-2.1.1" // {
+                dependencies = [
+                  sources."asynckit-0.4.0"
+                ];
+              })
+              (sources."har-validator-2.0.6" // {
+                dependencies = [
+                  (sources."commander-2.9.0" // {
+                    dependencies = [
+                      sources."graceful-readlink-1.0.1"
+                    ];
+                  })
+                  (sources."is-my-json-valid-2.15.0" // {
+                    dependencies = [
+                      sources."generate-function-2.0.0"
+                      (sources."generate-object-property-1.2.0" // {
+                        dependencies = [
+                          sources."is-property-1.0.2"
+                        ];
+                      })
+                      sources."jsonpointer-4.0.0"
+                      sources."xtend-4.0.1"
+                    ];
+                  })
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."hawk-3.1.3" // {
+                dependencies = [
+                  sources."hoek-2.16.3"
+                  sources."boom-2.10.1"
+                  sources."cryptiles-2.0.5"
+                  sources."sntp-1.0.9"
+                ];
+              })
+              (sources."http-signature-1.1.1" // {
+                dependencies = [
+                  sources."assert-plus-0.2.0"
+                  (sources."jsprim-1.3.1" // {
+                    dependencies = [
+                      sources."extsprintf-1.0.2"
+                      sources."json-schema-0.2.3"
+                      sources."verror-1.3.6"
+                    ];
+                  })
+                  (sources."sshpk-1.10.1" // {
+                    dependencies = [
+                      sources."asn1-0.2.3"
+                      sources."assert-plus-1.0.0"
+                      sources."dashdash-1.14.0"
+                      sources."getpass-0.1.6"
+                      sources."jsbn-0.1.0"
+                      sources."tweetnacl-0.14.3"
+                      sources."jodid25519-1.0.2"
+                      sources."ecc-jsbn-0.1.1"
+                      sources."bcrypt-pbkdf-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."is-typedarray-1.0.0"
+              sources."isstream-0.1.2"
+              sources."json-stringify-safe-5.0.1"
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+              sources."oauth-sign-0.8.2"
+              sources."qs-6.3.0"
+              sources."stringstream-0.0.5"
+              sources."tunnel-agent-0.4.3"
+            ];
+          })
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
         ];
       })
-      sources."q-1.0.1"
       (sources."nopt-3.0.1" // {
         dependencies = [
           sources."abbrev-1.0.9"
         ];
       })
+      sources."q-1.0.1"
       sources."underscore-1.7.0"
       (sources."update-notifier-0.5.0" // {
         dependencies = [
@@ -21140,7 +21824,7 @@ in
           })
           (sources."configstore-1.4.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -21174,7 +21858,7 @@ in
                 dependencies = [
                   (sources."got-3.3.1" // {
                     dependencies = [
-                      (sources."duplexify-3.4.5" // {
+                      (sources."duplexify-3.5.0" // {
                         dependencies = [
                           (sources."end-of-stream-1.0.0" // {
                             dependencies = [
@@ -21274,232 +21958,6 @@ in
           })
         ];
       })
-      (sources."insight-0.8.3" // {
-        dependencies = [
-          sources."async-1.5.2"
-          (sources."chalk-1.1.3" // {
-            dependencies = [
-              sources."ansi-styles-2.2.1"
-              sources."escape-string-regexp-1.0.5"
-              (sources."has-ansi-2.0.0" // {
-                dependencies = [
-                  sources."ansi-regex-2.0.0"
-                ];
-              })
-              (sources."strip-ansi-3.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-2.0.0"
-                ];
-              })
-              sources."supports-color-2.0.0"
-            ];
-          })
-          (sources."configstore-1.4.0" // {
-            dependencies = [
-              sources."graceful-fs-4.1.9"
-              (sources."mkdirp-0.5.1" // {
-                dependencies = [
-                  sources."minimist-0.0.8"
-                ];
-              })
-              sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                ];
-              })
-              sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
-                dependencies = [
-                  sources."imurmurhash-0.1.4"
-                  sources."slide-1.1.6"
-                ];
-              })
-              (sources."xdg-basedir-2.0.0" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                ];
-              })
-            ];
-          })
-          (sources."inquirer-0.10.1" // {
-            dependencies = [
-              sources."ansi-escapes-1.4.0"
-              sources."ansi-regex-2.0.0"
-              (sources."cli-cursor-1.0.2" // {
-                dependencies = [
-                  (sources."restore-cursor-1.0.1" // {
-                    dependencies = [
-                      sources."exit-hook-1.1.1"
-                      sources."onetime-1.1.0"
-                    ];
-                  })
-                ];
-              })
-              sources."cli-width-1.1.1"
-              (sources."figures-1.7.0" // {
-                dependencies = [
-                  sources."escape-string-regexp-1.0.5"
-                ];
-              })
-              sources."lodash-3.10.1"
-              (sources."readline2-1.0.1" // {
-                dependencies = [
-                  (sources."code-point-at-1.0.1" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
-                  (sources."is-fullwidth-code-point-1.0.0" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
-                  sources."mute-stream-0.0.5"
-                ];
-              })
-              (sources."run-async-0.1.0" // {
-                dependencies = [
-                  (sources."once-1.4.0" // {
-                    dependencies = [
-                      sources."wrappy-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."rx-lite-3.1.2"
-              sources."strip-ansi-3.0.1"
-              sources."through-2.3.8"
-            ];
-          })
-          (sources."lodash.debounce-3.1.1" // {
-            dependencies = [
-              sources."lodash._getnative-3.9.1"
-            ];
-          })
-          sources."node-uuid-1.4.7"
-          sources."object-assign-4.1.0"
-          (sources."os-name-1.0.3" // {
-            dependencies = [
-              (sources."osx-release-1.1.0" // {
-                dependencies = [
-                  sources."minimist-1.2.0"
-                ];
-              })
-              (sources."win-release-1.1.1" // {
-                dependencies = [
-                  sources."semver-5.3.0"
-                ];
-              })
-            ];
-          })
-          (sources."request-2.75.0" // {
-            dependencies = [
-              sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."caseless-0.11.0"
-              (sources."combined-stream-1.0.5" // {
-                dependencies = [
-                  sources."delayed-stream-1.0.0"
-                ];
-              })
-              sources."extend-3.0.0"
-              sources."forever-agent-0.6.1"
-              (sources."form-data-2.0.0" // {
-                dependencies = [
-                  sources."asynckit-0.4.0"
-                ];
-              })
-              (sources."har-validator-2.0.6" // {
-                dependencies = [
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.14.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-2.0.0"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              (sources."hawk-3.1.3" // {
-                dependencies = [
-                  sources."hoek-2.16.3"
-                  sources."boom-2.10.1"
-                  sources."cryptiles-2.0.5"
-                  sources."sntp-1.0.9"
-                ];
-              })
-              (sources."http-signature-1.1.1" // {
-                dependencies = [
-                  sources."assert-plus-0.2.0"
-                  (sources."jsprim-1.3.1" // {
-                    dependencies = [
-                      sources."extsprintf-1.0.2"
-                      sources."json-schema-0.2.3"
-                      sources."verror-1.3.6"
-                    ];
-                  })
-                  (sources."sshpk-1.10.1" // {
-                    dependencies = [
-                      sources."asn1-0.2.3"
-                      sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
-                      sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
-                      sources."jodid25519-1.0.2"
-                      sources."ecc-jsbn-0.1.1"
-                      sources."bcrypt-pbkdf-1.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."is-typedarray-1.0.0"
-              sources."isstream-0.1.2"
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
-                dependencies = [
-                  sources."mime-db-1.24.0"
-                ];
-              })
-              sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
-              sources."stringstream-0.0.5"
-              sources."tunnel-agent-0.4.3"
-            ];
-          })
-          sources."tough-cookie-2.3.1"
-        ];
-      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21511,10 +21969,10 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz";
-      sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
+      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
     };
     dependencies = [
       sources."clone-1.0.2"
@@ -21822,7 +22280,7 @@ in
       })
       (sources."fs-blob-store-5.2.1" // {
         dependencies = [
-          (sources."duplexify-3.4.5" // {
+          (sources."duplexify-3.5.0" // {
             dependencies = [
               (sources."end-of-stream-1.0.0" // {
                 dependencies = [
@@ -21855,14 +22313,22 @@ in
           sources."level-packager-0.18.0"
         ];
       })
-      (sources."level-sublevel-6.6.0" // {
+      (sources."level-sublevel-6.6.1" // {
         dependencies = [
-          (sources."pull-stream-2.21.0" // {
+          (sources."bytewise-1.1.0" // {
             dependencies = [
-              sources."pull-core-1.0.0"
+              (sources."bytewise-core-1.2.3" // {
+                dependencies = [
+                  sources."typewise-core-1.2.0"
+                ];
+              })
+              (sources."typewise-1.0.3" // {
+                dependencies = [
+                  sources."typewise-core-1.2.0"
+                ];
+              })
             ];
           })
-          sources."ltgt-2.1.2"
           (sources."levelup-0.19.1" // {
             dependencies = [
               sources."bl-0.8.2"
@@ -21885,20 +22351,26 @@ in
               sources."xtend-3.0.0"
             ];
           })
-          (sources."bytewise-1.1.0" // {
+          sources."ltgt-2.1.2"
+          (sources."pull-level-2.0.3" // {
             dependencies = [
-              (sources."bytewise-core-1.2.3" // {
+              sources."level-post-1.0.5"
+              sources."pull-cat-1.1.11"
+              sources."pull-live-1.0.1"
+              sources."pull-pushable-2.0.1"
+              (sources."pull-window-2.1.4" // {
                 dependencies = [
-                  sources."typewise-core-1.2.0"
+                  sources."looper-2.0.0"
                 ];
               })
-              (sources."typewise-1.0.3" // {
+              (sources."stream-to-pull-stream-1.7.2" // {
                 dependencies = [
-                  sources."typewise-core-1.2.0"
+                  sources."looper-3.0.0"
                 ];
               })
             ];
           })
+          sources."pull-stream-3.5.0"
           sources."typewiselite-1.0.0"
         ];
       })
@@ -21964,7 +22436,7 @@ in
       })
       (sources."pumpify-1.3.5" // {
         dependencies = [
-          (sources."duplexify-3.4.5" // {
+          (sources."duplexify-3.5.0" // {
             dependencies = [
               (sources."end-of-stream-1.0.0" // {
                 dependencies = [
@@ -22090,33 +22562,19 @@ in
       })
       (sources."async-2.0.1" // {
         dependencies = [
-          sources."lodash-4.16.2"
+          sources."lodash-4.16.6"
         ];
       })
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
           sources."minimist-0.0.10"
         ];
       })
-      (sources."request-2.75.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -22125,7 +22583,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.0.0" // {
+          (sources."form-data-2.1.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -22154,7 +22612,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -22162,7 +22620,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -22216,9 +22674,13 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
@@ -22252,7 +22714,7 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."got-6.5.0" // {
+      (sources."got-6.6.1" // {
         dependencies = [
           (sources."create-error-class-3.0.2" // {
             dependencies = [
@@ -22275,7 +22737,7 @@ in
           sources."is-stream-1.1.0"
           sources."lowercase-keys-1.0.0"
           sources."node-status-codes-2.0.1"
-          sources."timed-out-2.0.0"
+          sources."timed-out-3.0.0"
           sources."unzip-response-2.0.1"
           (sources."url-parse-lax-1.0.0" // {
             dependencies = [
@@ -22342,7 +22804,7 @@ in
                       sources."spdx-license-ids-1.2.2"
                     ];
                   })
-                  sources."spdx-expression-parse-1.0.3"
+                  sources."spdx-expression-parse-1.0.4"
                 ];
               })
             ];
@@ -22364,7 +22826,7 @@ in
                 dependencies = [
                   (sources."load-json-file-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -22389,7 +22851,7 @@ in
                   })
                   (sources."path-type-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       sources."pify-2.3.0"
                       (sources."pinkie-promise-2.0.1" // {
                         dependencies = [
@@ -22439,12 +22901,17 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.7.0";
+    version = "3.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz";
-      sha1 = "27499b403de70f8832815c3550330bad67292a57";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.9.1.tgz";
+      sha1 = "5a8597706fc6048bc6061ac754d4a211d28f4f5b";
     };
     dependencies = [
+      (sources."babel-code-frame-6.16.0" // {
+        dependencies = [
+          sources."js-tokens-2.0.0"
+        ];
+      })
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."ansi-styles-2.2.1"
@@ -22482,7 +22949,7 @@ in
           sources."ms-0.7.1"
         ];
       })
-      (sources."doctrine-1.4.0" // {
+      (sources."doctrine-1.5.0" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
@@ -22559,17 +23026,17 @@ in
                   sources."rimraf-2.5.4"
                 ];
               })
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               sources."write-0.2.1"
             ];
           })
           sources."object-assign-4.1.0"
         ];
       })
-      (sources."glob-7.1.0" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -22593,8 +23060,8 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."globals-9.10.0"
-      sources."ignore-3.1.5"
+      sources."globals-9.12.0"
+      sources."ignore-3.2.0"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
         dependencies = [
@@ -22619,11 +23086,7 @@ in
           })
           (sources."readline2-1.0.1" // {
             dependencies = [
-              (sources."code-point-at-1.0.1" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
+              sources."code-point-at-1.1.0"
               (sources."is-fullwidth-code-point-1.0.0" // {
                 dependencies = [
                   sources."number-is-nan-1.0.1"
@@ -22644,11 +23107,7 @@ in
           sources."rx-lite-3.1.2"
           (sources."string-width-1.0.2" // {
             dependencies = [
-              (sources."code-point-at-1.0.1" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
+              sources."code-point-at-1.1.0"
               (sources."is-fullwidth-code-point-1.0.0" // {
                 dependencies = [
                   sources."number-is-nan-1.0.1"
@@ -22660,7 +23119,7 @@ in
           sources."through-2.3.8"
         ];
       })
-      (sources."is-my-json-valid-2.14.0" // {
+      (sources."is-my-json-valid-2.15.0" // {
         dependencies = [
           sources."generate-function-2.0.0"
           (sources."generate-object-property-1.2.0" // {
@@ -22668,13 +23127,13 @@ in
               sources."is-property-1.0.2"
             ];
           })
-          sources."jsonpointer-2.0.0"
+          sources."jsonpointer-4.0.0"
           sources."xtend-4.0.1"
         ];
       })
       (sources."is-resolvable-1.0.0" // {
         dependencies = [
-          sources."tryit-1.0.2"
+          sources."tryit-1.0.3"
         ];
       })
       (sources."js-yaml-3.6.1" // {
@@ -22698,7 +23157,7 @@ in
           sources."type-check-0.3.2"
         ];
       })
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.6"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -22727,30 +23186,30 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      sources."shelljs-0.6.1"
+      (sources."shelljs-0.7.5" // {
+        dependencies = [
+          sources."interpret-1.0.1"
+          (sources."rechoir-0.6.2" // {
+            dependencies = [
+              sources."resolve-1.1.7"
+            ];
+          })
+        ];
+      })
       sources."strip-bom-3.0.0"
       sources."strip-json-comments-1.0.4"
-      (sources."table-3.8.0" // {
+      (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.7.5" // {
+          (sources."ajv-4.8.2" // {
             dependencies = [
               sources."co-4.6.0"
             ];
           })
           sources."ajv-keywords-1.1.1"
           sources."slice-ansi-0.0.4"
-          (sources."string-width-1.0.2" // {
+          (sources."string-width-2.0.0" // {
             dependencies = [
-              (sources."code-point-at-1.0.1" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
-              (sources."is-fullwidth-code-point-1.0.0" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
+              sources."is-fullwidth-code-point-2.0.0"
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
                   sources."ansi-regex-2.0.0"
@@ -22824,10 +23283,10 @@ in
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";
-    version = "0.15.2";
+    version = "0.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz";
-      sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9";
+      url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz";
+      sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2";
     };
     dependencies = [
       (sources."cliff-0.1.10" // {
@@ -22879,7 +23338,7 @@ in
           sources."director-1.2.7"
         ];
       })
-      (sources."forever-monitor-1.6.0" // {
+      (sources."forever-monitor-1.7.1" // {
         dependencies = [
           (sources."broadway-0.3.6" // {
             dependencies = [
@@ -22900,7 +23359,7 @@ in
               })
             ];
           })
-          (sources."chokidar-1.6.0" // {
+          (sources."chokidar-1.6.1" // {
             dependencies = [
               (sources."anymatch-1.3.0" // {
                 dependencies = [
@@ -22926,7 +23385,7 @@ in
                                     ];
                                   })
                                   sources."randomatic-1.1.5"
-                                  sources."repeat-string-1.5.4"
+                                  sources."repeat-string-1.6.1"
                                 ];
                               })
                             ];
@@ -22949,7 +23408,7 @@ in
                         ];
                       })
                       sources."normalize-path-2.0.1"
-                      (sources."object.omit-2.0.0" // {
+                      (sources."object.omit-2.0.1" // {
                         dependencies = [
                           (sources."for-own-0.1.4" // {
                             dependencies = [
@@ -22980,7 +23439,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.6.0"
+                  sources."binary-extensions-1.7.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -22990,17 +23449,7 @@ in
               })
               (sources."readdirp-2.1.0" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.9"
-                  (sources."minimatch-3.0.3" // {
-                    dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
-                        dependencies = [
-                          sources."balanced-match-0.4.2"
-                          sources."concat-map-0.0.1"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."graceful-fs-4.1.10"
                   (sources."readable-stream-2.1.5" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
@@ -23014,10 +23463,10 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.14" // {
+              (sources."fsevents-1.0.15" // {
                 dependencies = [
                   sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.30" // {
+                  (sources."node-pre-gyp-0.6.31" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23056,11 +23505,7 @@ in
                               sources."signal-exit-3.0.1"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
-                                  (sources."code-point-at-1.0.1" // {
-                                    dependencies = [
-                                      sources."number-is-nan-1.0.1"
-                                    ];
-                                  })
+                                  sources."code-point-at-1.1.0"
                                   (sources."is-fullwidth-code-point-1.0.0" // {
                                     dependencies = [
                                       sources."number-is-nan-1.0.1"
@@ -23087,23 +23532,10 @@ in
                           sources."strip-json-comments-1.0.4"
                         ];
                       })
-                      (sources."request-2.75.0" // {
+                      (sources."request-2.78.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.4.1"
-                          (sources."bl-1.1.2" // {
-                            dependencies = [
-                              (sources."readable-stream-2.0.6" // {
-                                dependencies = [
-                                  sources."core-util-is-1.0.2"
-                                  sources."isarray-1.0.0"
-                                  sources."process-nextick-args-1.0.7"
-                                  sources."string_decoder-0.10.31"
-                                  sources."util-deprecate-1.0.2"
-                                ];
-                              })
-                            ];
-                          })
+                          sources."aws4-1.5.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -23112,7 +23544,7 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.0.0" // {
+                          (sources."form-data-2.1.1" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
@@ -23141,7 +23573,7 @@ in
                                   sources."graceful-readlink-1.0.1"
                                 ];
                               })
-                              (sources."is-my-json-valid-2.14.0" // {
+                              (sources."is-my-json-valid-2.15.0" // {
                                 dependencies = [
                                   sources."generate-function-2.0.0"
                                   (sources."generate-object-property-1.2.0" // {
@@ -23149,7 +23581,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-2.0.0"
+                                  sources."jsonpointer-4.0.0"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -23203,32 +23635,26 @@ in
                           })
                           sources."node-uuid-1.4.7"
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.2.1"
+                          sources."qs-6.3.0"
                           sources."stringstream-0.0.5"
-                          sources."tough-cookie-2.3.1"
+                          (sources."tough-cookie-2.3.2" // {
+                            dependencies = [
+                              sources."punycode-1.4.1"
+                            ];
+                          })
                           sources."tunnel-agent-0.4.3"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
                         dependencies = [
-                          (sources."glob-7.1.0" // {
+                          (sources."glob-7.1.1" // {
                             dependencies = [
                               sources."fs.realpath-1.0.0"
-                              (sources."inflight-1.0.5" // {
+                              (sources."inflight-1.0.6" // {
                                 dependencies = [
                                   sources."wrappy-1.0.2"
                                 ];
                               })
-                              (sources."minimatch-3.0.3" // {
-                                dependencies = [
-                                  (sources."brace-expansion-1.1.6" // {
-                                    dependencies = [
-                                      sources."balanced-match-0.4.2"
-                                      sources."concat-map-0.0.1"
-                                    ];
-                                  })
-                                ];
-                              })
                               (sources."once-1.4.0" // {
                                 dependencies = [
                                   sources."wrappy-1.0.2"
@@ -23244,12 +23670,12 @@ in
                           sources."block-stream-0.0.9"
                           (sources."fstream-1.0.10" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                             ];
                           })
                         ];
                       })
-                      (sources."tar-pack-3.1.4" // {
+                      (sources."tar-pack-3.3.0" // {
                         dependencies = [
                           (sources."debug-2.2.0" // {
                             dependencies = [
@@ -23258,23 +23684,10 @@ in
                           })
                           (sources."fstream-1.0.10" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
-                            ];
-                          })
-                          (sources."fstream-ignore-1.0.5" // {
-                            dependencies = [
-                              (sources."minimatch-3.0.3" // {
-                                dependencies = [
-                                  (sources."brace-expansion-1.1.6" // {
-                                    dependencies = [
-                                      sources."balanced-match-0.4.2"
-                                      sources."concat-map-0.0.1"
-                                    ];
-                                  })
-                                ];
-                              })
+                              sources."graceful-fs-4.1.10"
                             ];
                           })
+                          sources."fstream-ignore-1.0.5"
                           (sources."once-1.3.3" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
@@ -23299,7 +23712,7 @@ in
               })
             ];
           })
-          (sources."minimatch-2.0.10" // {
+          (sources."minimatch-3.0.3" // {
             dependencies = [
               (sources."brace-expansion-1.1.6" // {
                 dependencies = [
@@ -23389,10 +23802,10 @@ in
           sources."ncp-0.4.2"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -23441,10 +23854,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.1";
+    version = "0.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.1.tgz";
-      sha1 = "7d9cb28a9e8e1076d005b94baa6ec5c6316fe1e9";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
+      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
     };
     dependencies = [
       (sources."minilog-2.0.8" // {
@@ -23458,7 +23871,7 @@ in
     meta = {
       description = "A tool for managing multiple git repositories";
       homepage = "https://github.com/mixu/gr#readme";
-      license = "BSD";
+      license = "BSD-3-Clause";
     };
     production = true;
   };
@@ -23475,7 +23888,7 @@ in
         dependencies = [
           (sources."glob-5.0.15" // {
             dependencies = [
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -23527,7 +23940,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.0"
+      sources."coffee-script-1.11.1"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
@@ -23540,7 +23953,7 @@ in
               })
               (sources."source-map-0.4.4" // {
                 dependencies = [
-                  sources."amdefine-1.0.0"
+                  sources."amdefine-1.0.1"
                 ];
               })
             ];
@@ -23583,7 +23996,7 @@ in
                 dependencies = [
                   (sources."source-map-0.1.43" // {
                     dependencies = [
-                      sources."amdefine-1.0.0"
+                      sources."amdefine-1.0.1"
                     ];
                   })
                   (sources."optimist-0.3.7" // {
@@ -23595,7 +24008,7 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.7.3" // {
+          (sources."uglify-js-2.7.4" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -23615,7 +24028,7 @@ in
                                 ];
                               })
                               sources."longest-1.0.1"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                           sources."lazy-cache-1.0.4"
@@ -23631,7 +24044,7 @@ in
                                 ];
                               })
                               sources."longest-1.0.1"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -23670,7 +24083,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.2"
+              sources."lodash-4.16.6"
             ];
           })
         ];
@@ -23758,7 +24171,7 @@ in
                               sources."spdx-license-ids-1.2.2"
                             ];
                           })
-                          sources."spdx-expression-parse-1.0.3"
+                          sources."spdx-expression-parse-1.0.4"
                         ];
                       })
                     ];
@@ -23780,7 +24193,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -23805,7 +24218,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -23930,7 +24343,7 @@ in
       (sources."liftoff-2.3.0" // {
         dependencies = [
           sources."extend-3.0.0"
-          (sources."findup-sync-0.4.2" // {
+          (sources."findup-sync-0.4.3" // {
             dependencies = [
               (sources."detect-file-0.1.0" // {
                 dependencies = [
@@ -23963,7 +24376,7 @@ in
                                 ];
                               })
                               sources."randomatic-1.1.5"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -23986,7 +24399,7 @@ in
                     ];
                   })
                   sources."normalize-path-2.0.1"
-                  (sources."object.omit-2.0.0" // {
+                  (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.4" // {
                         dependencies = [
@@ -24046,7 +24459,7 @@ in
               })
             ];
           })
-          (sources."fined-1.0.1" // {
+          (sources."fined-1.0.2" // {
             dependencies = [
               (sources."expand-tilde-1.2.2" // {
                 dependencies = [
@@ -24054,12 +24467,11 @@ in
                 ];
               })
               sources."lodash.assignwith-4.2.0"
-              sources."lodash.isarray-4.0.0"
               sources."lodash.isempty-4.4.0"
               sources."lodash.pick-4.4.0"
               (sources."parse-filepath-1.0.1" // {
                 dependencies = [
-                  (sources."is-absolute-0.2.5" // {
+                  (sources."is-absolute-0.2.6" // {
                     dependencies = [
                       (sources."is-relative-0.2.1" // {
                         dependencies = [
@@ -24070,7 +24482,7 @@ in
                           })
                         ];
                       })
-                      sources."is-windows-0.1.1"
+                      sources."is-windows-0.2.0"
                     ];
                   })
                   sources."map-cache-0.2.2"
@@ -24130,7 +24542,7 @@ in
             dependencies = [
               (sources."glob-4.5.3" // {
                 dependencies = [
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -24278,7 +24690,7 @@ in
       })
       (sources."glob-5.0.15" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -24413,7 +24825,7 @@ in
           })
           (sources."source-map-0.2.0" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
         ];
@@ -24421,7 +24833,7 @@ in
       sources."esprima-2.7.3"
       (sources."glob-5.0.15" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -24450,10 +24862,10 @@ in
           })
           (sources."source-map-0.4.4" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.7.3" // {
+          (sources."uglify-js-2.7.4" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -24473,7 +24885,7 @@ in
                                 ];
                               })
                               sources."longest-1.0.1"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                           sources."lazy-cache-1.0.4"
@@ -24489,7 +24901,7 @@ in
                                 ];
                               })
                               sources."longest-1.0.1"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -24568,18 +24980,18 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.9.3";
+    version = "2.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.3.tgz";
-      sha1 = "a2e14ff85c2d6bf8c8080e5aa55129ebc6a2d320";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
+      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
     };
     dependencies = [
-      (sources."cli-1.0.0" // {
+      (sources."cli-1.0.1" // {
         dependencies = [
-          (sources."glob-7.1.0" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -24753,7 +25165,7 @@ in
           })
         ];
       })
-      (sources."chokidar-1.6.0" // {
+      (sources."chokidar-1.6.1" // {
         dependencies = [
           (sources."anymatch-1.3.0" // {
             dependencies = [
@@ -24779,7 +25191,7 @@ in
                                 ];
                               })
                               sources."randomatic-1.1.5"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -24802,7 +25214,7 @@ in
                     ];
                   })
                   sources."normalize-path-2.0.1"
-                  (sources."object.omit-2.0.0" // {
+                  (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.4" // {
                         dependencies = [
@@ -24833,7 +25245,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.6.0"
+              sources."binary-extensions-1.7.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -24857,10 +25269,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.14" // {
+          (sources."fsevents-1.0.15" // {
             dependencies = [
               sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.30" // {
+              (sources."node-pre-gyp-0.6.31" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -24899,11 +25311,7 @@ in
                           sources."signal-exit-3.0.1"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
-                              (sources."code-point-at-1.0.1" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
+                              sources."code-point-at-1.1.0"
                               (sources."is-fullwidth-code-point-1.0.0" // {
                                 dependencies = [
                                   sources."number-is-nan-1.0.1"
@@ -24930,23 +25338,10 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.75.0" // {
+                  (sources."request-2.78.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.4.1"
-                      (sources."bl-1.1.2" // {
-                        dependencies = [
-                          (sources."readable-stream-2.0.6" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."aws4-1.5.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -24955,7 +25350,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.0.0" // {
+                      (sources."form-data-2.1.1" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -24984,7 +25379,7 @@ in
                               sources."graceful-readlink-1.0.1"
                             ];
                           })
-                          (sources."is-my-json-valid-2.14.0" // {
+                          (sources."is-my-json-valid-2.15.0" // {
                             dependencies = [
                               sources."generate-function-2.0.0"
                               (sources."generate-object-property-1.2.0" // {
@@ -24992,7 +25387,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-2.0.0"
+                              sources."jsonpointer-4.0.0"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -25046,9 +25441,13 @@ in
                       })
                       sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.2.1"
+                      sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
-                      sources."tough-cookie-2.3.1"
+                      (sources."tough-cookie-2.3.2" // {
+                        dependencies = [
+                          sources."punycode-1.4.1"
+                        ];
+                      })
                       sources."tunnel-agent-0.4.3"
                     ];
                   })
@@ -25059,7 +25458,7 @@ in
                       sources."fstream-1.0.10"
                     ];
                   })
-                  (sources."tar-pack-3.1.4" // {
+                  (sources."tar-pack-3.3.0" // {
                     dependencies = [
                       (sources."debug-2.2.0" // {
                         dependencies = [
@@ -25095,7 +25494,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.16.2"
+          sources."lodash-4.16.6"
         ];
       })
       (sources."connect-3.5.0" // {
@@ -25125,7 +25524,7 @@ in
       sources."di-0.0.1"
       (sources."dom-serialize-2.2.1" // {
         dependencies = [
-          sources."custom-event-1.0.0"
+          sources."custom-event-1.0.1"
           sources."ent-2.2.0"
           sources."extend-3.0.0"
           sources."void-elements-2.0.1"
@@ -25147,10 +25546,10 @@ in
           })
         ];
       })
-      (sources."glob-7.1.0" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -25164,8 +25563,8 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.9"
-      (sources."http-proxy-1.15.1" // {
+      sources."graceful-fs-4.1.10"
+      (sources."http-proxy-1.15.2" // {
         dependencies = [
           sources."eventemitter3-1.2.0"
           sources."requires-port-1.0.0"
@@ -25409,7 +25808,7 @@ in
                       sources."negotiator-0.5.3"
                     ];
                   })
-                  (sources."compressible-2.0.8" // {
+                  (sources."compressible-2.0.9" // {
                     dependencies = [
                       sources."mime-db-1.24.0"
                     ];
@@ -25651,7 +26050,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.2"
+              sources."lodash-4.16.6"
             ];
           })
         ];
@@ -25695,9 +26094,9 @@ in
           sources."replace-ext-0.0.1"
         ];
       })
-      (sources."vinyl-fs-2.4.3" // {
+      (sources."vinyl-fs-2.4.4" // {
         dependencies = [
-          (sources."duplexify-3.4.5" // {
+          (sources."duplexify-3.5.0" // {
             dependencies = [
               (sources."end-of-stream-1.0.0" // {
                 dependencies = [
@@ -25717,7 +26116,7 @@ in
               sources."extend-3.0.0"
               (sources."glob-5.0.15" // {
                 dependencies = [
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -25741,13 +26140,14 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."glob-parent-3.0.0" // {
+              (sources."glob-parent-3.0.1" // {
                 dependencies = [
-                  (sources."is-glob-3.0.0" // {
+                  (sources."is-glob-3.1.0" // {
                     dependencies = [
-                      sources."is-extglob-2.0.0"
+                      sources."is-extglob-2.1.0"
                     ];
                   })
+                  sources."path-dirname-1.0.2"
                 ];
               })
               (sources."micromatch-2.3.11" // {
@@ -25771,7 +26171,7 @@ in
                                 ];
                               })
                               sources."randomatic-1.1.5"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -25795,7 +26195,7 @@ in
                     ];
                   })
                   sources."normalize-path-2.0.1"
-                  (sources."object.omit-2.0.0" // {
+                  (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.4" // {
                         dependencies = [
@@ -25861,7 +26261,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           (sources."gulp-sourcemaps-1.6.0" // {
             dependencies = [
               sources."convert-source-map-1.3.0"
@@ -26011,7 +26411,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
@@ -26032,7 +26432,7 @@ in
                       sources."spdx-license-ids-1.2.2"
                     ];
                   })
-                  sources."spdx-expression-parse-1.0.3"
+                  sources."spdx-expression-parse-1.0.4"
                 ];
               })
             ];
@@ -26048,24 +26448,10 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.75.0" // {
+          (sources."request-2.78.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
+              sources."aws4-1.5.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -26074,7 +26460,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.0.0" // {
+              (sources."form-data-2.1.1" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -26103,7 +26489,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -26111,7 +26497,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -26165,19 +26551,23 @@ in
               })
               sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
           sources."retry-0.8.0"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -26227,11 +26617,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -26254,7 +26640,7 @@ in
       })
       (sources."npmconf-2.0.9" // {
         dependencies = [
-          (sources."config-chain-1.1.10" // {
+          (sources."config-chain-1.1.11" // {
             dependencies = [
               sources."proto-list-1.2.4"
             ];
@@ -26291,7 +26677,7 @@ in
           sources."block-stream-0.0.9"
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -26299,10 +26685,10 @@ in
               })
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -26384,10 +26770,10 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."glob-7.1.0" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -26401,7 +26787,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       (sources."minimatch-3.0.3" // {
         dependencies = [
           (sources."brace-expansion-1.1.6" // {
@@ -26450,11 +26836,7 @@ in
               sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
-                  (sources."code-point-at-1.0.1" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
+                  sources."code-point-at-1.1.0"
                   (sources."is-fullwidth-code-point-1.0.0" // {
                     dependencies = [
                       sources."number-is-nan-1.0.1"
@@ -26502,24 +26884,10 @@ in
           })
         ];
       })
-      (sources."request-2.75.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.4.1"
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
+          sources."aws4-1.5.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -26528,7 +26896,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.0.0" // {
+          (sources."form-data-2.1.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -26557,7 +26925,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -26565,7 +26933,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -26619,9 +26987,13 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
@@ -26741,7 +27113,7 @@ in
                                   sources."spdx-license-ids-1.2.2"
                                 ];
                               })
-                              sources."spdx-expression-parse-1.0.3"
+                              sources."spdx-expression-parse-1.0.4"
                             ];
                           })
                         ];
@@ -26763,7 +27135,7 @@ in
                             dependencies = [
                               (sources."load-json-file-1.1.0" // {
                                 dependencies = [
-                                  sources."graceful-fs-4.1.9"
+                                  sources."graceful-fs-4.1.10"
                                   (sources."parse-json-2.2.0" // {
                                     dependencies = [
                                       (sources."error-ex-1.3.0" // {
@@ -26788,7 +27160,7 @@ in
                               })
                               (sources."path-type-1.1.0" // {
                                 dependencies = [
-                                  sources."graceful-fs-4.1.9"
+                                  sources."graceful-fs-4.1.10"
                                   sources."pify-2.3.0"
                                   (sources."pinkie-promise-2.0.1" // {
                                     dependencies = [
@@ -26918,7 +27290,7 @@ in
       })
       (sources."glob-5.0.15" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -26967,7 +27339,7 @@ in
       (sources."v8-debug-0.7.7" // {
         dependencies = [
           sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.30" // {
+          (sources."node-pre-gyp-0.6.31" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27007,11 +27379,7 @@ in
                       sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
-                          (sources."code-point-at-1.0.1" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
+                          sources."code-point-at-1.1.0"
                           (sources."is-fullwidth-code-point-1.0.0" // {
                             dependencies = [
                               sources."number-is-nan-1.0.1"
@@ -27030,24 +27398,10 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.75.0" // {
+              (sources."request-2.78.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.4.1"
-                  (sources."bl-1.1.2" // {
-                    dependencies = [
-                      (sources."readable-stream-2.0.6" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."aws4-1.5.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27056,7 +27410,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.0.0" // {
+                  (sources."form-data-2.1.1" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -27085,7 +27439,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.14.0" // {
+                      (sources."is-my-json-valid-2.15.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -27093,7 +27447,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-2.0.0"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27147,18 +27501,22 @@ in
                   })
                   sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.2.1"
+                  sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
-                  sources."tough-cookie-2.3.1"
+                  (sources."tough-cookie-2.3.2" // {
+                    dependencies = [
+                      sources."punycode-1.4.1"
+                    ];
+                  })
                   sources."tunnel-agent-0.4.3"
                 ];
               })
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -27189,17 +27547,17 @@ in
                   sources."block-stream-0.0.9"
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                     ];
                   })
                   sources."inherits-2.0.3"
                 ];
               })
-              (sources."tar-pack-3.1.4" // {
+              (sources."tar-pack-3.3.0" // {
                 dependencies = [
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -27244,7 +27602,7 @@ in
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
           sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.30" // {
+          (sources."node-pre-gyp-0.6.31" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27284,11 +27642,7 @@ in
                       sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
-                          (sources."code-point-at-1.0.1" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
+                          sources."code-point-at-1.1.0"
                           (sources."is-fullwidth-code-point-1.0.0" // {
                             dependencies = [
                               sources."number-is-nan-1.0.1"
@@ -27307,24 +27661,10 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."request-2.75.0" // {
+              (sources."request-2.78.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.4.1"
-                  (sources."bl-1.1.2" // {
-                    dependencies = [
-                      (sources."readable-stream-2.0.6" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."aws4-1.5.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27333,7 +27673,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.0.0" // {
+                  (sources."form-data-2.1.1" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -27362,7 +27702,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.14.0" // {
+                      (sources."is-my-json-valid-2.15.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -27370,7 +27710,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-2.0.0"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27424,18 +27764,22 @@ in
                   })
                   sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.2.1"
+                  sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
-                  sources."tough-cookie-2.3.1"
+                  (sources."tough-cookie-2.3.2" // {
+                    dependencies = [
+                      sources."punycode-1.4.1"
+                    ];
+                  })
                   sources."tunnel-agent-0.4.3"
                 ];
               })
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -27466,17 +27810,17 @@ in
                   sources."block-stream-0.0.9"
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                     ];
                   })
                   sources."inherits-2.0.3"
                 ];
               })
-              (sources."tar-pack-3.1.4" // {
+              (sources."tar-pack-3.3.0" // {
                 dependencies = [
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -27554,11 +27898,7 @@ in
           })
           (sources."string-width-1.0.2" // {
             dependencies = [
-              (sources."code-point-at-1.0.1" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
+              sources."code-point-at-1.1.0"
               (sources."is-fullwidth-code-point-1.0.0" // {
                 dependencies = [
                   sources."number-is-nan-1.0.1"
@@ -27586,10 +27926,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.30";
+    version = "0.6.31";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.30.tgz";
-      sha1 = "64d3073a6f573003717ccfe30c89023297babba1";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -27630,11 +27970,7 @@ in
               sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
-                  (sources."code-point-at-1.0.1" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
+                  sources."code-point-at-1.1.0"
                   (sources."is-fullwidth-code-point-1.0.0" // {
                     dependencies = [
                       sources."number-is-nan-1.0.1"
@@ -27661,24 +27997,10 @@ in
           sources."strip-json-comments-1.0.4"
         ];
       })
-      (sources."request-2.75.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.4.1"
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
+          sources."aws4-1.5.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -27687,7 +28009,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.0.0" // {
+          (sources."form-data-2.1.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -27716,7 +28038,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -27724,7 +28046,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -27778,18 +28100,22 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          (sources."glob-7.1.0" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -27821,13 +28147,13 @@ in
           sources."block-stream-0.0.9"
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
             ];
           })
           sources."inherits-2.0.3"
         ];
       })
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           (sources."debug-2.2.0" // {
             dependencies = [
@@ -27836,7 +28162,7 @@ in
           })
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               sources."inherits-2.0.3"
             ];
           })
@@ -27886,13 +28212,13 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.10.2";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.10.2.tgz";
-      sha1 = "ec511e14c3ad0858fc121c6006890ed27b7c412e";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.11.0.tgz";
+      sha1 = "226c562bd2a7b13d3d7518b49ad4828a3623d06c";
     };
     dependencies = [
-      (sources."chokidar-1.6.0" // {
+      (sources."chokidar-1.6.1" // {
         dependencies = [
           (sources."anymatch-1.3.0" // {
             dependencies = [
@@ -27918,7 +28244,7 @@ in
                                 ];
                               })
                               sources."randomatic-1.1.5"
-                              sources."repeat-string-1.5.4"
+                              sources."repeat-string-1.6.1"
                             ];
                           })
                         ];
@@ -27941,7 +28267,7 @@ in
                     ];
                   })
                   sources."normalize-path-2.0.1"
-                  (sources."object.omit-2.0.0" // {
+                  (sources."object.omit-2.0.1" // {
                     dependencies = [
                       (sources."for-own-0.1.4" // {
                         dependencies = [
@@ -27972,7 +28298,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.6.0"
+              sources."binary-extensions-1.7.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -27983,7 +28309,7 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               (sources."readable-stream-2.1.5" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
@@ -27997,10 +28323,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.14" // {
+          (sources."fsevents-1.0.15" // {
             dependencies = [
               sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.30" // {
+              (sources."node-pre-gyp-0.6.31" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28039,11 +28365,7 @@ in
                           sources."signal-exit-3.0.1"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
-                              (sources."code-point-at-1.0.1" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
+                              sources."code-point-at-1.1.0"
                               (sources."is-fullwidth-code-point-1.0.0" // {
                                 dependencies = [
                                   sources."number-is-nan-1.0.1"
@@ -28070,23 +28392,10 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.75.0" // {
+                  (sources."request-2.78.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.4.1"
-                      (sources."bl-1.1.2" // {
-                        dependencies = [
-                          (sources."readable-stream-2.0.6" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."aws4-1.5.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -28095,7 +28404,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.0.0" // {
+                      (sources."form-data-2.1.1" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -28124,7 +28433,7 @@ in
                               sources."graceful-readlink-1.0.1"
                             ];
                           })
-                          (sources."is-my-json-valid-2.14.0" // {
+                          (sources."is-my-json-valid-2.15.0" // {
                             dependencies = [
                               sources."generate-function-2.0.0"
                               (sources."generate-object-property-1.2.0" // {
@@ -28132,7 +28441,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-2.0.0"
+                              sources."jsonpointer-4.0.0"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -28186,18 +28495,22 @@ in
                       })
                       sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.2.1"
+                      sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
-                      sources."tough-cookie-2.3.1"
+                      (sources."tough-cookie-2.3.2" // {
+                        dependencies = [
+                          sources."punycode-1.4.1"
+                        ];
+                      })
                       sources."tunnel-agent-0.4.3"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
                     dependencies = [
-                      (sources."glob-7.1.0" // {
+                      (sources."glob-7.1.1" // {
                         dependencies = [
                           sources."fs.realpath-1.0.0"
-                          (sources."inflight-1.0.5" // {
+                          (sources."inflight-1.0.6" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
                             ];
@@ -28217,16 +28530,16 @@ in
                       sources."block-stream-0.0.9"
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                         ];
                       })
                     ];
                   })
-                  (sources."tar-pack-3.1.4" // {
+                  (sources."tar-pack-3.3.0" // {
                     dependencies = [
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                         ];
                       })
                       sources."fstream-ignore-1.0.5"
@@ -28344,7 +28657,7 @@ in
           })
           (sources."configstore-1.4.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -28378,7 +28691,7 @@ in
                 dependencies = [
                   (sources."got-3.3.1" // {
                     dependencies = [
-                      (sources."duplexify-3.4.5" // {
+                      (sources."duplexify-3.5.0" // {
                         dependencies = [
                           (sources."end-of-stream-1.0.0" // {
                             dependencies = [
@@ -28490,10 +28803,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.14.6";
+    version = "0.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.14.6.tgz";
-      sha1 = "be4520445e3c34523cba7376eac81364c054e51c";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
+      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
     };
     dependencies = [
       sources."basic-auth-1.0.4"
@@ -28533,12 +28846,12 @@ in
           })
         ];
       })
-      (sources."cheerio-0.19.0" // {
+      (sources."cheerio-0.22.0" // {
         dependencies = [
-          (sources."css-select-1.0.0" // {
+          (sources."css-select-1.2.0" // {
             dependencies = [
-              sources."css-what-1.0.0"
-              (sources."domutils-1.4.3" // {
+              sources."css-what-2.1.0"
+              (sources."domutils-1.5.1" // {
                 dependencies = [
                   sources."domelementtype-1.3.0"
                 ];
@@ -28547,48 +28860,61 @@ in
               sources."nth-check-1.0.1"
             ];
           })
-          sources."entities-1.1.1"
-          (sources."htmlparser2-3.8.3" // {
-            dependencies = [
-              sources."domhandler-2.3.0"
-              sources."domutils-1.5.1"
-              sources."domelementtype-1.3.0"
-              (sources."readable-stream-1.1.14" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-0.0.1"
-                  sources."string_decoder-0.10.31"
-                  sources."inherits-2.0.3"
-                ];
-              })
-              sources."entities-1.0.0"
-            ];
-          })
           (sources."dom-serializer-0.1.0" // {
             dependencies = [
               sources."domelementtype-1.1.3"
             ];
           })
-          sources."lodash-3.10.1"
+          sources."entities-1.1.1"
+          (sources."htmlparser2-3.9.2" // {
+            dependencies = [
+              sources."domelementtype-1.3.0"
+              sources."domhandler-2.3.0"
+              sources."domutils-1.5.1"
+              sources."inherits-2.0.3"
+              (sources."readable-stream-2.1.5" // {
+                dependencies = [
+                  sources."buffer-shims-1.0.0"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          sources."lodash.assignin-4.2.0"
+          sources."lodash.bind-4.2.1"
+          sources."lodash.defaults-4.2.0"
+          sources."lodash.filter-4.6.0"
+          sources."lodash.flatten-4.4.0"
+          sources."lodash.foreach-4.5.0"
+          sources."lodash.map-4.6.0"
+          sources."lodash.merge-4.6.0"
+          sources."lodash.pick-4.4.0"
+          sources."lodash.reduce-4.6.0"
+          sources."lodash.reject-4.6.0"
+          sources."lodash.some-4.6.0"
         ];
       })
-      sources."clone-1.0.2"
+      sources."clone-2.0.0"
       (sources."cookie-parser-1.4.3" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
         ];
       })
-      (sources."cors-2.7.1" // {
+      (sources."cors-2.8.1" // {
         dependencies = [
           sources."vary-1.1.0"
         ];
       })
-      (sources."cron-1.1.0" // {
+      (sources."cron-1.1.1" // {
         dependencies = [
-          (sources."moment-timezone-0.3.1" // {
+          (sources."moment-timezone-0.5.7" // {
             dependencies = [
-              sources."moment-2.15.1"
+              sources."moment-2.15.2"
             ];
           })
         ];
@@ -28683,16 +29009,16 @@ in
       })
       (sources."fs-extra-0.30.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."jsonfile-2.4.0"
-          sources."klaw-1.3.0"
+          sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -28739,7 +29065,7 @@ in
       })
       sources."is-utf8-0.2.1"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.13.0" // {
+      (sources."mqtt-1.14.1" // {
         dependencies = [
           (sources."commist-1.0.0" // {
             dependencies = [
@@ -28769,7 +29095,188 @@ in
               })
             ];
           })
-          sources."help-me-0.1.0"
+          (sources."help-me-1.0.1" // {
+            dependencies = [
+              sources."callback-stream-1.1.0"
+              (sources."glob-stream-5.3.5" // {
+                dependencies = [
+                  sources."extend-3.0.0"
+                  (sources."glob-5.0.15" // {
+                    dependencies = [
+                      (sources."inflight-1.0.6" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      (sources."minimatch-3.0.3" // {
+                        dependencies = [
+                          (sources."brace-expansion-1.1.6" // {
+                            dependencies = [
+                              sources."balanced-match-0.4.2"
+                              sources."concat-map-0.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."once-1.4.0" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."path-is-absolute-1.0.1"
+                    ];
+                  })
+                  (sources."glob-parent-3.0.1" // {
+                    dependencies = [
+                      (sources."is-glob-3.1.0" // {
+                        dependencies = [
+                          sources."is-extglob-2.1.0"
+                        ];
+                      })
+                      sources."path-dirname-1.0.2"
+                    ];
+                  })
+                  (sources."micromatch-2.3.11" // {
+                    dependencies = [
+                      (sources."arr-diff-2.0.0" // {
+                        dependencies = [
+                          sources."arr-flatten-1.0.1"
+                        ];
+                      })
+                      sources."array-unique-0.2.1"
+                      (sources."braces-1.8.5" // {
+                        dependencies = [
+                          (sources."expand-range-1.8.2" // {
+                            dependencies = [
+                              (sources."fill-range-2.2.3" // {
+                                dependencies = [
+                                  sources."is-number-2.1.0"
+                                  (sources."isobject-2.1.0" // {
+                                    dependencies = [
+                                      sources."isarray-1.0.0"
+                                    ];
+                                  })
+                                  sources."randomatic-1.1.5"
+                                  sources."repeat-string-1.6.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."preserve-0.2.0"
+                          sources."repeat-element-1.1.2"
+                        ];
+                      })
+                      (sources."expand-brackets-0.1.5" // {
+                        dependencies = [
+                          sources."is-posix-bracket-0.1.1"
+                        ];
+                      })
+                      sources."extglob-0.3.2"
+                      sources."filename-regex-2.0.0"
+                      sources."is-extglob-1.0.0"
+                      sources."is-glob-2.0.1"
+                      (sources."kind-of-3.0.4" // {
+                        dependencies = [
+                          sources."is-buffer-1.1.4"
+                        ];
+                      })
+                      sources."normalize-path-2.0.1"
+                      (sources."object.omit-2.0.1" // {
+                        dependencies = [
+                          (sources."for-own-0.1.4" // {
+                            dependencies = [
+                              sources."for-in-0.1.6"
+                            ];
+                          })
+                          sources."is-extendable-0.1.1"
+                        ];
+                      })
+                      (sources."parse-glob-3.0.4" // {
+                        dependencies = [
+                          (sources."glob-base-0.3.0" // {
+                            dependencies = [
+                              sources."glob-parent-2.0.0"
+                            ];
+                          })
+                          sources."is-dotfile-1.0.2"
+                        ];
+                      })
+                      (sources."regex-cache-0.4.3" // {
+                        dependencies = [
+                          sources."is-equal-shallow-0.1.3"
+                          sources."is-primitive-2.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ordered-read-streams-0.3.0" // {
+                    dependencies = [
+                      sources."is-stream-1.1.0"
+                      (sources."readable-stream-2.1.5" // {
+                        dependencies = [
+                          sources."buffer-shims-1.0.0"
+                          sources."core-util-is-1.0.2"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."string_decoder-0.10.31"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."through2-0.6.5"
+                  (sources."to-absolute-glob-0.1.1" // {
+                    dependencies = [
+                      (sources."extend-shallow-2.0.1" // {
+                        dependencies = [
+                          sources."is-extendable-0.1.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."unique-stream-2.2.1" // {
+                    dependencies = [
+                      (sources."json-stable-stringify-1.0.1" // {
+                        dependencies = [
+                          sources."jsonify-0.0.0"
+                        ];
+                      })
+                      (sources."through2-filter-2.0.0" // {
+                        dependencies = [
+                          (sources."through2-2.0.1" // {
+                            dependencies = [
+                              (sources."readable-stream-2.0.6" // {
+                                dependencies = [
+                                  sources."core-util-is-1.0.2"
+                                  sources."isarray-1.0.0"
+                                  sources."process-nextick-args-1.0.7"
+                                  sources."string_decoder-0.10.31"
+                                  sources."util-deprecate-1.0.2"
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."through2-2.0.1" // {
+                dependencies = [
+                  (sources."readable-stream-2.0.6" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."process-nextick-args-1.0.7"
+                      sources."string_decoder-0.10.31"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
           sources."inherits-2.0.3"
           sources."minimist-1.2.0"
           (sources."mqtt-connection-2.1.1" // {
@@ -28819,7 +29326,7 @@ in
           })
           (sources."websocket-stream-3.3.0" // {
             dependencies = [
-              (sources."duplexify-3.4.5" // {
+              (sources."duplexify-3.5.0" // {
                 dependencies = [
                   (sources."end-of-stream-1.0.0" // {
                     dependencies = [
@@ -28873,7 +29380,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."oauth2orize-1.4.0" // {
+      (sources."oauth2orize-1.5.0" // {
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
@@ -28919,7 +29426,7 @@ in
           })
         ];
       })
-      (sources."uglify-js-2.7.0" // {
+      (sources."uglify-js-2.7.3" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -28939,7 +29446,7 @@ in
                             ];
                           })
                           sources."longest-1.0.1"
-                          sources."repeat-string-1.5.4"
+                          sources."repeat-string-1.6.1"
                         ];
                       })
                       sources."lazy-cache-1.0.4"
@@ -28955,7 +29462,7 @@ in
                             ];
                           })
                           sources."longest-1.0.1"
-                          sources."repeat-string-1.5.4"
+                          sources."repeat-string-1.6.1"
                         ];
                       })
                     ];
@@ -28993,12 +29500,12 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.16.2"
+              sources."lodash-4.16.6"
             ];
           })
         ];
       })
-      (sources."node-red-node-feedparser-0.1.5" // {
+      (sources."node-red-node-feedparser-0.1.6" // {
         dependencies = [
           (sources."feedparser-1.1.3" // {
             dependencies = [
@@ -29015,223 +29522,10 @@ in
               })
             ];
           })
-          (sources."request-2.65.0" // {
-            dependencies = [
-              (sources."bl-1.0.3" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."caseless-0.11.0"
-              sources."extend-3.0.0"
-              sources."forever-agent-0.6.1"
-              (sources."form-data-1.0.1" // {
-                dependencies = [
-                  (sources."async-2.0.1" // {
-                    dependencies = [
-                      sources."lodash-4.16.2"
-                    ];
-                  })
-                ];
-              })
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.12" // {
-                dependencies = [
-                  sources."mime-db-1.24.0"
-                ];
-              })
-              sources."node-uuid-1.4.7"
-              sources."qs-5.2.1"
-              sources."tunnel-agent-0.4.3"
-              sources."tough-cookie-2.2.2"
-              (sources."http-signature-0.11.0" // {
-                dependencies = [
-                  sources."assert-plus-0.1.5"
-                  sources."asn1-0.1.11"
-                  sources."ctype-0.5.3"
-                ];
-              })
-              sources."oauth-sign-0.8.2"
-              (sources."hawk-3.1.3" // {
-                dependencies = [
-                  sources."hoek-2.16.3"
-                  sources."boom-2.10.1"
-                  sources."cryptiles-2.0.5"
-                  sources."sntp-1.0.9"
-                ];
-              })
-              sources."aws-sign2-0.6.0"
-              sources."stringstream-0.0.5"
-              (sources."combined-stream-1.0.5" // {
-                dependencies = [
-                  sources."delayed-stream-1.0.0"
-                ];
-              })
-              sources."isstream-0.1.2"
-              (sources."har-validator-2.0.6" // {
-                dependencies = [
-                  (sources."chalk-1.1.3" // {
-                    dependencies = [
-                      sources."ansi-styles-2.2.1"
-                      sources."escape-string-regexp-1.0.5"
-                      (sources."has-ansi-2.0.0" // {
-                        dependencies = [
-                          sources."ansi-regex-2.0.0"
-                        ];
-                      })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.0.0"
-                        ];
-                      })
-                      sources."supports-color-2.0.0"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                  (sources."is-my-json-valid-2.14.0" // {
-                    dependencies = [
-                      sources."generate-function-2.0.0"
-                      (sources."generate-object-property-1.2.0" // {
-                        dependencies = [
-                          sources."is-property-1.0.2"
-                        ];
-                      })
-                      sources."jsonpointer-2.0.0"
-                      sources."xtend-4.0.1"
-                    ];
-                  })
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-        ];
-      })
-      (sources."node-red-node-email-0.1.11" // {
-        dependencies = [
-          (sources."nodemailer-1.11.0" // {
-            dependencies = [
-              (sources."libmime-1.2.0" // {
-                dependencies = [
-                  sources."iconv-lite-0.4.13"
-                  sources."libbase64-0.1.0"
-                  sources."libqp-1.1.0"
-                ];
-              })
-              (sources."mailcomposer-2.1.0" // {
-                dependencies = [
-                  (sources."buildmail-2.0.0" // {
-                    dependencies = [
-                      sources."addressparser-0.3.2"
-                      sources."libbase64-0.1.0"
-                      sources."libqp-1.1.0"
-                      (sources."needle-0.10.0" // {
-                        dependencies = [
-                          (sources."debug-2.2.0" // {
-                            dependencies = [
-                              sources."ms-0.7.1"
-                            ];
-                          })
-                          sources."iconv-lite-0.4.13"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-              (sources."needle-0.11.0" // {
-                dependencies = [
-                  (sources."debug-2.2.0" // {
-                    dependencies = [
-                      sources."ms-0.7.1"
-                    ];
-                  })
-                  sources."iconv-lite-0.4.13"
-                ];
-              })
-              (sources."nodemailer-direct-transport-1.1.0" // {
-                dependencies = [
-                  sources."smtp-connection-1.3.8"
-                ];
-              })
-              (sources."nodemailer-smtp-transport-1.1.0" // {
-                dependencies = [
-                  sources."nodemailer-wellknown-0.1.10"
-                  sources."smtp-connection-1.3.8"
-                ];
-              })
-            ];
-          })
-          (sources."poplib-0.1.7" // {
-            dependencies = [
-              (sources."optimist-0.6.1" // {
-                dependencies = [
-                  sources."wordwrap-0.0.3"
-                  sources."minimist-0.0.10"
-                ];
-              })
-            ];
-          })
-          (sources."mailparser-0.6.1" // {
-            dependencies = [
-              (sources."mimelib-0.2.19" // {
-                dependencies = [
-                  sources."addressparser-0.3.2"
-                ];
-              })
-              (sources."encoding-0.1.12" // {
-                dependencies = [
-                  sources."iconv-lite-0.4.13"
-                ];
-              })
-              sources."mime-1.3.4"
-              (sources."uue-3.0.0" // {
-                dependencies = [
-                  sources."extend-3.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."imap-0.8.18" // {
-            dependencies = [
-              sources."utf7-1.0.2"
-              (sources."readable-stream-1.1.14" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-0.0.1"
-                  sources."string_decoder-0.10.31"
-                  sources."inherits-2.0.3"
-                ];
-              })
-            ];
-          })
-        ];
-      })
-      (sources."node-red-node-twitter-0.1.7" // {
-        dependencies = [
-          sources."twitter-ng-0.6.2"
-          sources."oauth-0.9.14"
-          (sources."request-2.75.0" // {
+          (sources."request-2.74.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
+              sources."aws4-1.5.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -29254,9 +29548,13 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.0.0" // {
+              (sources."form-data-1.0.1" // {
                 dependencies = [
-                  sources."asynckit-0.4.0"
+                  (sources."async-2.1.2" // {
+                    dependencies = [
+                      sources."lodash-4.16.6"
+                    ];
+                  })
                 ];
               })
               (sources."har-validator-2.0.6" // {
@@ -29283,7 +29581,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -29291,7 +29589,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -29347,26 +29645,259 @@ in
               sources."oauth-sign-0.8.2"
               sources."qs-6.2.1"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
+              sources."tunnel-agent-0.4.3"
+            ];
+          })
+        ];
+      })
+      (sources."node-red-node-email-0.1.11" // {
+        dependencies = [
+          (sources."nodemailer-1.11.0" // {
+            dependencies = [
+              (sources."libmime-1.2.0" // {
+                dependencies = [
+                  sources."iconv-lite-0.4.13"
+                  sources."libbase64-0.1.0"
+                  sources."libqp-1.1.0"
+                ];
+              })
+              (sources."mailcomposer-2.1.0" // {
+                dependencies = [
+                  (sources."buildmail-2.0.0" // {
+                    dependencies = [
+                      sources."addressparser-0.3.2"
+                      sources."libbase64-0.1.0"
+                      sources."libqp-1.1.0"
+                      (sources."needle-0.10.0" // {
+                        dependencies = [
+                          (sources."debug-2.2.0" // {
+                            dependencies = [
+                              sources."ms-0.7.1"
+                            ];
+                          })
+                          sources."iconv-lite-0.4.13"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."needle-0.11.0" // {
+                dependencies = [
+                  (sources."debug-2.2.0" // {
+                    dependencies = [
+                      sources."ms-0.7.1"
+                    ];
+                  })
+                  sources."iconv-lite-0.4.13"
+                ];
+              })
+              (sources."nodemailer-direct-transport-1.1.0" // {
+                dependencies = [
+                  sources."smtp-connection-1.3.8"
+                ];
+              })
+              (sources."nodemailer-smtp-transport-1.1.0" // {
+                dependencies = [
+                  sources."clone-1.0.2"
+                  sources."nodemailer-wellknown-0.1.10"
+                  sources."smtp-connection-1.3.8"
+                ];
+              })
+            ];
+          })
+          (sources."poplib-0.1.7" // {
+            dependencies = [
+              (sources."optimist-0.6.1" // {
+                dependencies = [
+                  sources."wordwrap-0.0.3"
+                  sources."minimist-0.0.10"
+                ];
+              })
+            ];
+          })
+          (sources."mailparser-0.6.1" // {
+            dependencies = [
+              (sources."mimelib-0.2.19" // {
+                dependencies = [
+                  sources."addressparser-0.3.2"
+                ];
+              })
+              (sources."encoding-0.1.12" // {
+                dependencies = [
+                  sources."iconv-lite-0.4.13"
+                ];
+              })
+              sources."mime-1.3.4"
+              (sources."uue-3.0.0" // {
+                dependencies = [
+                  sources."extend-3.0.0"
+                ];
+              })
+            ];
+          })
+          (sources."imap-0.8.18" // {
+            dependencies = [
+              sources."utf7-1.0.2"
+              (sources."readable-stream-1.1.14" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-0.0.1"
+                  sources."string_decoder-0.10.31"
+                  sources."inherits-2.0.3"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."node-red-node-twitter-0.1.7" // {
+        dependencies = [
+          sources."twitter-ng-0.6.2"
+          sources."oauth-0.9.14"
+          (sources."request-2.78.0" // {
+            dependencies = [
+              sources."aws-sign2-0.6.0"
+              sources."aws4-1.5.0"
+              sources."caseless-0.11.0"
+              (sources."combined-stream-1.0.5" // {
+                dependencies = [
+                  sources."delayed-stream-1.0.0"
+                ];
+              })
+              sources."extend-3.0.0"
+              sources."forever-agent-0.6.1"
+              (sources."form-data-2.1.1" // {
+                dependencies = [
+                  sources."asynckit-0.4.0"
+                ];
+              })
+              (sources."har-validator-2.0.6" // {
+                dependencies = [
+                  (sources."chalk-1.1.3" // {
+                    dependencies = [
+                      sources."ansi-styles-2.2.1"
+                      sources."escape-string-regexp-1.0.5"
+                      (sources."has-ansi-2.0.0" // {
+                        dependencies = [
+                          sources."ansi-regex-2.0.0"
+                        ];
+                      })
+                      (sources."strip-ansi-3.0.1" // {
+                        dependencies = [
+                          sources."ansi-regex-2.0.0"
+                        ];
+                      })
+                      sources."supports-color-2.0.0"
+                    ];
+                  })
+                  (sources."commander-2.9.0" // {
+                    dependencies = [
+                      sources."graceful-readlink-1.0.1"
+                    ];
+                  })
+                  (sources."is-my-json-valid-2.15.0" // {
+                    dependencies = [
+                      sources."generate-function-2.0.0"
+                      (sources."generate-object-property-1.2.0" // {
+                        dependencies = [
+                          sources."is-property-1.0.2"
+                        ];
+                      })
+                      sources."jsonpointer-4.0.0"
+                      sources."xtend-4.0.1"
+                    ];
+                  })
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."hawk-3.1.3" // {
+                dependencies = [
+                  sources."hoek-2.16.3"
+                  sources."boom-2.10.1"
+                  sources."cryptiles-2.0.5"
+                  sources."sntp-1.0.9"
+                ];
+              })
+              (sources."http-signature-1.1.1" // {
+                dependencies = [
+                  sources."assert-plus-0.2.0"
+                  (sources."jsprim-1.3.1" // {
+                    dependencies = [
+                      sources."extsprintf-1.0.2"
+                      sources."json-schema-0.2.3"
+                      sources."verror-1.3.6"
+                    ];
+                  })
+                  (sources."sshpk-1.10.1" // {
+                    dependencies = [
+                      sources."asn1-0.2.3"
+                      sources."assert-plus-1.0.0"
+                      sources."dashdash-1.14.0"
+                      sources."getpass-0.1.6"
+                      sources."jsbn-0.1.0"
+                      sources."tweetnacl-0.14.3"
+                      sources."jodid25519-1.0.2"
+                      sources."ecc-jsbn-0.1.1"
+                      sources."bcrypt-pbkdf-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."is-typedarray-1.0.0"
+              sources."isstream-0.1.2"
+              sources."json-stringify-safe-5.0.1"
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+              sources."node-uuid-1.4.7"
+              sources."oauth-sign-0.8.2"
+              sources."qs-6.3.0"
+              sources."stringstream-0.0.5"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
         ];
       })
       sources."node-red-node-rbe-0.1.5"
-      (sources."node-red-node-serialport-0.2.1" // {
+      (sources."node-red-node-serialport-0.4.0" // {
         dependencies = [
-          (sources."serialport-2.1.2" // {
+          (sources."serialport-4.0.4" // {
             dependencies = [
               sources."bindings-1.2.1"
-              sources."bluebird-3.4.6"
+              (sources."commander-2.9.0" // {
+                dependencies = [
+                  sources."graceful-readlink-1.0.1"
+                ];
+              })
               (sources."debug-2.2.0" // {
                 dependencies = [
                   sources."ms-0.7.1"
                 ];
               })
-              sources."nan-2.2.1"
-              (sources."node-pre-gyp-0.6.30" // {
+              (sources."lie-3.1.0" // {
+                dependencies = [
+                  sources."immediate-3.0.6"
+                ];
+              })
+              sources."nan-2.4.0"
+              (sources."node-pre-gyp-0.6.31" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -29401,11 +29932,7 @@ in
                           sources."signal-exit-3.0.1"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
-                              (sources."code-point-at-1.0.1" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
+                              sources."code-point-at-1.1.0"
                               (sources."is-fullwidth-code-point-1.0.0" // {
                                 dependencies = [
                                   sources."number-is-nan-1.0.1"
@@ -29432,24 +29959,10 @@ in
                       sources."strip-json-comments-1.0.4"
                     ];
                   })
-                  (sources."request-2.75.0" // {
+                  (sources."request-2.78.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.4.1"
-                      (sources."bl-1.1.2" // {
-                        dependencies = [
-                          (sources."readable-stream-2.0.6" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."aws4-1.5.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -29458,7 +29971,7 @@ in
                       })
                       sources."extend-3.0.0"
                       sources."forever-agent-0.6.1"
-                      (sources."form-data-2.0.0" // {
+                      (sources."form-data-2.1.1" // {
                         dependencies = [
                           sources."asynckit-0.4.0"
                         ];
@@ -29482,12 +29995,7 @@ in
                               sources."supports-color-2.0.0"
                             ];
                           })
-                          (sources."commander-2.9.0" // {
-                            dependencies = [
-                              sources."graceful-readlink-1.0.1"
-                            ];
-                          })
-                          (sources."is-my-json-valid-2.14.0" // {
+                          (sources."is-my-json-valid-2.15.0" // {
                             dependencies = [
                               sources."generate-function-2.0.0"
                               (sources."generate-object-property-1.2.0" // {
@@ -29495,7 +30003,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-2.0.0"
+                              sources."jsonpointer-4.0.0"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -29549,18 +30057,22 @@ in
                       })
                       sources."node-uuid-1.4.7"
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.2.1"
+                      sources."qs-6.3.0"
                       sources."stringstream-0.0.5"
-                      sources."tough-cookie-2.3.1"
+                      (sources."tough-cookie-2.3.2" // {
+                        dependencies = [
+                          sources."punycode-1.4.1"
+                        ];
+                      })
                       sources."tunnel-agent-0.4.3"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
                     dependencies = [
-                      (sources."glob-7.1.0" // {
+                      (sources."glob-7.1.1" // {
                         dependencies = [
                           sources."fs.realpath-1.0.0"
-                          (sources."inflight-1.0.5" // {
+                          (sources."inflight-1.0.6" // {
                             dependencies = [
                               sources."wrappy-1.0.2"
                             ];
@@ -29591,17 +30103,17 @@ in
                       sources."block-stream-0.0.9"
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                         ];
                       })
                       sources."inherits-2.0.3"
                     ];
                   })
-                  (sources."tar-pack-3.1.4" // {
+                  (sources."tar-pack-3.3.0" // {
                     dependencies = [
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.9"
+                          sources."graceful-fs-4.1.10"
                           sources."inherits-2.0.3"
                         ];
                       })
@@ -29641,20 +30153,6 @@ in
                   })
                 ];
               })
-              (sources."node-pre-gyp-github-1.3.1" // {
-                dependencies = [
-                  (sources."github-0.2.4" // {
-                    dependencies = [
-                      sources."mime-1.3.4"
-                    ];
-                  })
-                  (sources."commander-2.9.0" // {
-                    dependencies = [
-                      sources."graceful-readlink-1.0.1"
-                    ];
-                  })
-                ];
-              })
               (sources."object.assign-4.0.4" // {
                 dependencies = [
                   sources."function-bind-1.1.0"
@@ -29666,13 +30164,6 @@ in
                   })
                 ];
               })
-              (sources."optimist-0.6.1" // {
-                dependencies = [
-                  sources."wordwrap-0.0.3"
-                  sources."minimist-0.0.10"
-                ];
-              })
-              sources."sf-0.1.7"
             ];
           })
         ];
@@ -29759,7 +30250,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.11.0"
+          sources."coffee-script-1.11.1"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -29885,10 +30376,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "3.10.8";
+    version = "3.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz";
-      sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e";
+      url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
+      sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
     };
     dependencies = [
       sources."abbrev-1.0.9"
@@ -29912,7 +30403,7 @@ in
           })
         ];
       })
-      (sources."config-chain-1.1.10" // {
+      (sources."config-chain-1.1.11" // {
         dependencies = [
           sources."proto-list-1.2.4"
         ];
@@ -29940,7 +30431,7 @@ in
           })
         ];
       })
-      (sources."glob-7.0.6" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
           (sources."minimatch-3.0.3" // {
@@ -29956,11 +30447,11 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.9"
+      sources."graceful-fs-4.1.10"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
       (sources."init-package-json-1.9.4" // {
@@ -30026,11 +30517,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -30114,11 +30601,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -30150,11 +30633,7 @@ in
               sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
-                  (sources."code-point-at-1.0.1" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
+                  sources."code-point-at-1.1.0"
                   (sources."is-fullwidth-code-point-1.0.0" // {
                     dependencies = [
                       sources."number-is-nan-1.0.1"
@@ -30224,10 +30703,10 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.74.0" // {
+      (sources."request-2.75.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.4.1"
+          sources."aws4-1.5.0"
           (sources."bl-1.1.2" // {
             dependencies = [
               (sources."readable-stream-2.0.6" // {
@@ -30249,13 +30728,9 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-1.0.1" // {
+          (sources."form-data-2.0.0" // {
             dependencies = [
-              (sources."async-2.0.1" // {
-                dependencies = [
-                  sources."lodash-4.16.2"
-                ];
-              })
+              sources."asynckit-0.4.0"
             ];
           })
           (sources."har-validator-2.0.6" // {
@@ -30273,7 +30748,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -30281,7 +30756,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -30337,7 +30812,11 @@ in
           sources."oauth-sign-0.8.2"
           sources."qs-6.2.1"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
@@ -30391,7 +30870,7 @@ in
               sources."spdx-license-ids-1.2.2"
             ];
           })
-          sources."spdx-expression-parse-1.0.3"
+          sources."spdx-expression-parse-1.0.4"
         ];
       })
     ];
@@ -30422,24 +30901,10 @@ in
       })
       (sources."npm-registry-client-0.2.27" // {
         dependencies = [
-          (sources."request-2.75.0" // {
+          (sources."request-2.78.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
+              sources."aws4-1.5.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -30448,7 +30913,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.0.0" // {
+              (sources."form-data-2.1.1" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -30477,7 +30942,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -30485,7 +30950,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30539,9 +31004,13 @@ in
               })
               sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
@@ -30552,10 +31021,10 @@ in
           sources."mkdirp-0.3.5"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -30611,11 +31080,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -30638,7 +31103,7 @@ in
       })
       (sources."npmconf-0.1.1" // {
         dependencies = [
-          (sources."config-chain-1.1.10" // {
+          (sources."config-chain-1.1.11" // {
             dependencies = [
               sources."proto-list-1.2.4"
               sources."ini-1.3.4"
@@ -30680,10 +31145,10 @@ in
               })
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -30740,7 +31205,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.0"
+      sources."coffee-script-1.11.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30752,10 +31217,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.0";
+    version = "2.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.0.tgz";
-      sha1 = "8e457f49e8b73ea0c4a00ab76cd79e598bd57992";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
+      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
     };
     dependencies = [
       sources."bluebird-3.4.6"
@@ -30787,7 +31252,7 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      sources."fast-diff-1.0.1"
+      sources."fast-diff-1.1.1"
       (sources."find-up-1.1.2" // {
         dependencies = [
           sources."path-exists-2.1.0"
@@ -30804,13 +31269,9 @@ in
           sources."jju-1.3.0"
         ];
       })
-      sources."lodash-3.10.1"
-      (sources."node-alias-1.0.4" // {
-        dependencies = [
-          sources."lodash-4.16.2"
-        ];
-      })
-      (sources."npm-3.10.8" // {
+      sources."lodash-4.16.6"
+      sources."node-alias-1.0.4"
+      (sources."npm-3.10.9" // {
         dependencies = [
           sources."abbrev-1.0.9"
           sources."ansicolors-0.3.2"
@@ -30833,7 +31294,7 @@ in
               })
             ];
           })
-          (sources."config-chain-1.1.10" // {
+          (sources."config-chain-1.1.11" // {
             dependencies = [
               sources."proto-list-1.2.4"
             ];
@@ -30861,7 +31322,7 @@ in
               })
             ];
           })
-          (sources."glob-7.0.6" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
@@ -30877,11 +31338,11 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."has-unicode-2.0.1"
           sources."hosted-git-info-2.1.5"
           sources."iferr-0.1.5"
-          sources."inflight-1.0.5"
+          sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
           (sources."init-package-json-1.9.4" // {
@@ -30947,11 +31408,7 @@ in
                       sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
-                          (sources."code-point-at-1.0.1" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
+                          sources."code-point-at-1.1.0"
                           (sources."is-fullwidth-code-point-1.0.0" // {
                             dependencies = [
                               sources."number-is-nan-1.0.1"
@@ -31035,11 +31492,7 @@ in
                       sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
-                          (sources."code-point-at-1.0.1" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
+                          sources."code-point-at-1.1.0"
                           (sources."is-fullwidth-code-point-1.0.0" // {
                             dependencies = [
                               sources."number-is-nan-1.0.1"
@@ -31071,11 +31524,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -31140,10 +31589,10 @@ in
             ];
           })
           sources."realize-package-specifier-3.0.3"
-          (sources."request-2.74.0" // {
+          (sources."request-2.75.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
+              sources."aws4-1.5.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -31165,18 +31614,14 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-1.0.1" // {
+              (sources."form-data-2.0.0" // {
                 dependencies = [
-                  (sources."async-2.0.1" // {
-                    dependencies = [
-                      sources."lodash-4.16.2"
-                    ];
-                  })
+                  sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-2.0.6" // {
                 dependencies = [
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -31184,7 +31629,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -31240,7 +31685,11 @@ in
               sources."oauth-sign-0.8.2"
               sources."qs-6.2.1"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
@@ -31293,7 +31742,7 @@ in
                   sources."spdx-license-ids-1.2.2"
                 ];
               })
-              sources."spdx-expression-parse-1.0.3"
+              sources."spdx-expression-parse-1.0.4"
             ];
           })
         ];
@@ -31303,15 +31752,54 @@ in
           sources."semver-4.3.6"
         ];
       })
-      sources."require-dir-0.3.0"
+      sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      sources."spawn-please-0.1.0"
-      (sources."update-notifier-0.5.0" // {
+      sources."spawn-please-0.2.0"
+      (sources."update-notifier-1.0.2" // {
         dependencies = [
-          (sources."configstore-1.4.0" // {
+          (sources."boxen-0.6.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."ansi-align-1.1.0"
+              sources."camelcase-2.1.1"
+              sources."cli-boxes-1.0.0"
+              sources."filled-array-1.1.0"
+              sources."object-assign-4.1.0"
+              (sources."repeating-2.0.1" // {
+                dependencies = [
+                  (sources."is-finite-1.0.2" // {
+                    dependencies = [
+                      sources."number-is-nan-1.0.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.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."widest-line-1.0.0"
+            ];
+          })
+          (sources."configstore-2.1.0" // {
+            dependencies = [
+              (sources."dot-prop-3.0.0" // {
+                dependencies = [
+                  sources."is-obj-1.0.1"
+                ];
+              })
+              sources."graceful-fs-4.1.10"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -31331,77 +31819,72 @@ in
                   sources."slide-1.1.6"
                 ];
               })
-              (sources."xdg-basedir-2.0.0" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                ];
-              })
             ];
           })
           sources."is-npm-1.0.0"
-          (sources."latest-version-1.0.1" // {
+          (sources."latest-version-2.0.0" // {
             dependencies = [
-              (sources."package-json-1.2.0" // {
+              (sources."package-json-2.4.0" // {
                 dependencies = [
-                  (sources."got-3.3.1" // {
+                  (sources."got-5.7.1" // {
                     dependencies = [
-                      (sources."duplexify-3.4.5" // {
+                      (sources."create-error-class-3.0.2" // {
                         dependencies = [
-                          (sources."end-of-stream-1.0.0" // {
-                            dependencies = [
-                              (sources."once-1.3.3" // {
-                                dependencies = [
-                                  sources."wrappy-1.0.2"
-                                ];
-                              })
-                            ];
-                          })
-                          sources."inherits-2.0.3"
-                          (sources."readable-stream-2.1.5" // {
-                            dependencies = [
-                              sources."buffer-shims-1.0.0"
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                          sources."stream-shift-1.0.0"
+                          sources."capture-stack-trace-1.0.0"
                         ];
                       })
-                      sources."infinity-agent-2.0.3"
+                      sources."duplexer2-0.1.4"
                       sources."is-redirect-1.0.0"
+                      sources."is-retry-allowed-1.1.0"
                       sources."is-stream-1.1.0"
                       sources."lowercase-keys-1.0.0"
-                      (sources."nested-error-stacks-1.0.2" // {
+                      sources."node-status-codes-1.0.0"
+                      sources."object-assign-4.1.0"
+                      (sources."parse-json-2.2.0" // {
                         dependencies = [
+                          (sources."error-ex-1.3.0" // {
+                            dependencies = [
+                              sources."is-arrayish-0.2.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
+                      sources."read-all-stream-3.1.0"
+                      (sources."readable-stream-2.1.5" // {
+                        dependencies = [
+                          sources."buffer-shims-1.0.0"
+                          sources."core-util-is-1.0.2"
                           sources."inherits-2.0.3"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."string_decoder-0.10.31"
+                          sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."object-assign-3.0.0"
-                      sources."prepend-http-1.0.4"
-                      (sources."read-all-stream-3.1.0" // {
+                      sources."timed-out-3.0.0"
+                      sources."unzip-response-1.0.2"
+                      (sources."url-parse-lax-1.0.0" // {
                         dependencies = [
-                          (sources."pinkie-promise-2.0.1" // {
-                            dependencies = [
-                              sources."pinkie-2.0.4"
-                            ];
-                          })
-                          (sources."readable-stream-2.1.5" // {
-                            dependencies = [
-                              sources."buffer-shims-1.0.0"
-                              sources."core-util-is-1.0.2"
-                              sources."inherits-2.0.3"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
+                          sources."prepend-http-1.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."registry-auth-token-3.1.0" // {
+                    dependencies = [
+                      (sources."rc-1.1.6" // {
+                        dependencies = [
+                          sources."deep-extend-0.4.1"
+                          sources."ini-1.3.4"
+                          sources."minimist-1.2.0"
+                          sources."strip-json-comments-1.0.4"
                         ];
                       })
-                      sources."timed-out-2.0.0"
                     ];
                   })
                   (sources."registry-url-3.1.0" // {
@@ -31420,23 +31903,11 @@ in
               })
             ];
           })
-          (sources."repeating-1.1.3" // {
-            dependencies = [
-              (sources."is-finite-1.0.2" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
-            ];
-          })
+          sources."lazy-req-1.1.0"
           sources."semver-diff-2.1.0"
-          (sources."string-length-1.0.1" // {
+          (sources."xdg-basedir-2.0.0" // {
             dependencies = [
-              (sources."strip-ansi-3.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-2.0.0"
-                ];
-              })
+              sources."os-homedir-1.0.2"
             ];
           })
         ];
@@ -31450,13 +31921,529 @@ in
     };
     production = true;
   };
+  parsoid = nodeEnv.buildNodePackage {
+    name = "parsoid";
+    packageName = "parsoid";
+    version = "0.5.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.5.3.tgz";
+      sha1 = "f1dea92c78b80f6af02d3652025e31fd8a81efde";
+    };
+    dependencies = [
+      sources."async-0.9.2"
+      (sources."babybird-0.0.1" // {
+        dependencies = [
+          sources."asap-2.0.5"
+          sources."is-arguments-1.0.2"
+        ];
+      })
+      (sources."body-parser-1.15.2" // {
+        dependencies = [
+          sources."bytes-2.4.0"
+          sources."content-type-1.0.2"
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
+          sources."depd-1.1.0"
+          (sources."http-errors-1.5.0" // {
+            dependencies = [
+              sources."inherits-2.0.1"
+              sources."setprototypeof-1.0.1"
+              sources."statuses-1.3.0"
+            ];
+          })
+          sources."iconv-lite-0.4.13"
+          (sources."on-finished-2.3.0" // {
+            dependencies = [
+              sources."ee-first-1.1.1"
+            ];
+          })
+          sources."qs-6.2.0"
+          (sources."raw-body-2.1.7" // {
+            dependencies = [
+              sources."unpipe-1.0.0"
+            ];
+          })
+          (sources."type-is-1.6.13" // {
+            dependencies = [
+              sources."media-typer-0.3.0"
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."bunyan-1.8.4" // {
+        dependencies = [
+          (sources."dtrace-provider-0.7.1" // {
+            dependencies = [
+              sources."nan-2.4.0"
+            ];
+          })
+          (sources."mv-2.1.1" // {
+            dependencies = [
+              (sources."mkdirp-0.5.1" // {
+                dependencies = [
+                  sources."minimist-0.0.8"
+                ];
+              })
+              sources."ncp-2.0.0"
+              (sources."rimraf-2.4.5" // {
+                dependencies = [
+                  (sources."glob-6.0.4" // {
+                    dependencies = [
+                      (sources."inflight-1.0.6" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."inherits-2.0.3"
+                      (sources."minimatch-3.0.3" // {
+                        dependencies = [
+                          (sources."brace-expansion-1.1.6" // {
+                            dependencies = [
+                              sources."balanced-match-0.4.2"
+                              sources."concat-map-0.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."once-1.4.0" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      sources."path-is-absolute-1.0.1"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."safe-json-stringify-1.0.3"
+          sources."moment-2.15.2"
+        ];
+      })
+      (sources."compression-1.6.2" // {
+        dependencies = [
+          (sources."accepts-1.3.3" // {
+            dependencies = [
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+              sources."negotiator-0.6.1"
+            ];
+          })
+          sources."bytes-2.3.0"
+          (sources."compressible-2.0.9" // {
+            dependencies = [
+              sources."mime-db-1.24.0"
+            ];
+          })
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
+          sources."on-headers-1.0.1"
+          sources."vary-1.1.0"
+        ];
+      })
+      (sources."connect-busboy-0.0.2" // {
+        dependencies = [
+          (sources."busboy-0.2.13" // {
+            dependencies = [
+              (sources."dicer-0.2.5" // {
+                dependencies = [
+                  sources."streamsearch-0.1.2"
+                ];
+              })
+              (sources."readable-stream-1.1.14" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-0.0.1"
+                  sources."string_decoder-0.10.31"
+                  sources."inherits-2.0.3"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      sources."core-js-1.2.7"
+      sources."diff-1.4.0"
+      sources."domino-1.0.27"
+      sources."entities-1.1.1"
+      (sources."express-4.14.0" // {
+        dependencies = [
+          (sources."accepts-1.3.3" // {
+            dependencies = [
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+              sources."negotiator-0.6.1"
+            ];
+          })
+          sources."array-flatten-1.1.1"
+          sources."content-disposition-0.5.1"
+          sources."content-type-1.0.2"
+          sources."cookie-0.3.1"
+          sources."cookie-signature-1.0.6"
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
+          sources."depd-1.1.0"
+          sources."encodeurl-1.0.1"
+          sources."escape-html-1.0.3"
+          sources."etag-1.7.0"
+          (sources."finalhandler-0.5.0" // {
+            dependencies = [
+              sources."statuses-1.3.0"
+              sources."unpipe-1.0.0"
+            ];
+          })
+          sources."fresh-0.3.0"
+          sources."merge-descriptors-1.0.1"
+          sources."methods-1.1.2"
+          (sources."on-finished-2.3.0" // {
+            dependencies = [
+              sources."ee-first-1.1.1"
+            ];
+          })
+          sources."parseurl-1.3.1"
+          sources."path-to-regexp-0.1.7"
+          (sources."proxy-addr-1.1.2" // {
+            dependencies = [
+              sources."forwarded-0.1.0"
+              sources."ipaddr.js-1.1.1"
+            ];
+          })
+          sources."qs-6.2.0"
+          sources."range-parser-1.2.0"
+          (sources."send-0.14.1" // {
+            dependencies = [
+              sources."destroy-1.0.4"
+              (sources."http-errors-1.5.0" // {
+                dependencies = [
+                  sources."inherits-2.0.1"
+                  sources."setprototypeof-1.0.1"
+                ];
+              })
+              sources."mime-1.3.4"
+              sources."ms-0.7.1"
+              sources."statuses-1.3.0"
+            ];
+          })
+          sources."serve-static-1.11.1"
+          (sources."type-is-1.6.13" // {
+            dependencies = [
+              sources."media-typer-0.3.0"
+              (sources."mime-types-2.1.12" // {
+                dependencies = [
+                  sources."mime-db-1.24.0"
+                ];
+              })
+            ];
+          })
+          sources."utils-merge-1.0.0"
+          sources."vary-1.1.0"
+        ];
+      })
+      (sources."express-handlebars-2.0.1" // {
+        dependencies = [
+          (sources."glob-5.0.15" // {
+            dependencies = [
+              (sources."inflight-1.0.6" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."inherits-2.0.3"
+              (sources."minimatch-3.0.3" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.6" // {
+                    dependencies = [
+                      sources."balanced-match-0.4.2"
+                      sources."concat-map-0.0.1"
+                    ];
+                  })
+                ];
+              })
+              (sources."once-1.4.0" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+          (sources."graceful-fs-3.0.11" // {
+            dependencies = [
+              sources."natives-1.1.0"
+            ];
+          })
+          (sources."handlebars-3.0.3" // {
+            dependencies = [
+              (sources."optimist-0.6.1" // {
+                dependencies = [
+                  sources."wordwrap-0.0.3"
+                  sources."minimist-0.0.10"
+                ];
+              })
+              (sources."source-map-0.1.43" // {
+                dependencies = [
+                  sources."amdefine-1.0.1"
+                ];
+              })
+              (sources."uglify-js-2.3.6" // {
+                dependencies = [
+                  sources."async-0.2.10"
+                  (sources."optimist-0.3.7" // {
+                    dependencies = [
+                      sources."wordwrap-0.0.3"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."object.assign-1.1.1" // {
+            dependencies = [
+              sources."object-keys-1.0.11"
+            ];
+          })
+          (sources."promise-6.1.0" // {
+            dependencies = [
+              sources."asap-1.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."finalhandler-0.4.1" // {
+        dependencies = [
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
+          sources."escape-html-1.0.3"
+          (sources."on-finished-2.3.0" // {
+            dependencies = [
+              sources."ee-first-1.1.1"
+            ];
+          })
+          sources."unpipe-1.0.0"
+        ];
+      })
+      (sources."gelf-stream-0.2.4" // {
+        dependencies = [
+          sources."gelfling-0.2.0"
+        ];
+      })
+      (sources."html5-1.0.5" // {
+        dependencies = [
+          sources."opts-1.2.2"
+          sources."html5-entities-1.0.0"
+          (sources."jsdom-0.11.1" // {
+            dependencies = [
+              (sources."htmlparser2-3.9.2" // {
+                dependencies = [
+                  sources."domelementtype-1.3.0"
+                  sources."domhandler-2.3.0"
+                  (sources."domutils-1.5.1" // {
+                    dependencies = [
+                      (sources."dom-serializer-0.1.0" // {
+                        dependencies = [
+                          sources."domelementtype-1.1.3"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."inherits-2.0.3"
+                  (sources."readable-stream-2.1.5" // {
+                    dependencies = [
+                      sources."buffer-shims-1.0.0"
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."process-nextick-args-1.0.7"
+                      sources."string_decoder-0.10.31"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."nwmatcher-1.3.9"
+              sources."xmlhttprequest-1.8.0"
+              sources."cssom-0.3.1"
+              sources."cssstyle-0.2.37"
+              (sources."contextify-0.1.15" // {
+                dependencies = [
+                  sources."bindings-1.2.1"
+                  sources."nan-2.4.0"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      sources."node-txstatsd-0.1.6"
+      sources."node-uuid-1.4.7"
+      sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
+      (sources."prfun-2.1.4" // {
+        dependencies = [
+          sources."core-js-2.4.1"
+        ];
+      })
+      (sources."request-2.78.0" // {
+        dependencies = [
+          sources."aws-sign2-0.6.0"
+          sources."aws4-1.5.0"
+          sources."caseless-0.11.0"
+          (sources."combined-stream-1.0.5" // {
+            dependencies = [
+              sources."delayed-stream-1.0.0"
+            ];
+          })
+          sources."extend-3.0.0"
+          sources."forever-agent-0.6.1"
+          (sources."form-data-2.1.1" // {
+            dependencies = [
+              sources."asynckit-0.4.0"
+            ];
+          })
+          (sources."har-validator-2.0.6" // {
+            dependencies = [
+              (sources."chalk-1.1.3" // {
+                dependencies = [
+                  sources."ansi-styles-2.2.1"
+                  sources."escape-string-regexp-1.0.5"
+                  (sources."has-ansi-2.0.0" // {
+                    dependencies = [
+                      sources."ansi-regex-2.0.0"
+                    ];
+                  })
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.0.0"
+                    ];
+                  })
+                  sources."supports-color-2.0.0"
+                ];
+              })
+              (sources."commander-2.9.0" // {
+                dependencies = [
+                  sources."graceful-readlink-1.0.1"
+                ];
+              })
+              (sources."is-my-json-valid-2.15.0" // {
+                dependencies = [
+                  sources."generate-function-2.0.0"
+                  (sources."generate-object-property-1.2.0" // {
+                    dependencies = [
+                      sources."is-property-1.0.2"
+                    ];
+                  })
+                  sources."jsonpointer-4.0.0"
+                  sources."xtend-4.0.1"
+                ];
+              })
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
+            ];
+          })
+          (sources."hawk-3.1.3" // {
+            dependencies = [
+              sources."hoek-2.16.3"
+              sources."boom-2.10.1"
+              sources."cryptiles-2.0.5"
+              sources."sntp-1.0.9"
+            ];
+          })
+          (sources."http-signature-1.1.1" // {
+            dependencies = [
+              sources."assert-plus-0.2.0"
+              (sources."jsprim-1.3.1" // {
+                dependencies = [
+                  sources."extsprintf-1.0.2"
+                  sources."json-schema-0.2.3"
+                  sources."verror-1.3.6"
+                ];
+              })
+              (sources."sshpk-1.10.1" // {
+                dependencies = [
+                  sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
+                  sources."dashdash-1.14.0"
+                  sources."getpass-0.1.6"
+                  sources."jsbn-0.1.0"
+                  sources."tweetnacl-0.14.3"
+                  sources."jodid25519-1.0.2"
+                  sources."ecc-jsbn-0.1.1"
+                  sources."bcrypt-pbkdf-1.0.0"
+                ];
+              })
+            ];
+          })
+          sources."is-typedarray-1.0.0"
+          sources."isstream-0.1.2"
+          sources."json-stringify-safe-5.0.1"
+          (sources."mime-types-2.1.12" // {
+            dependencies = [
+              sources."mime-db-1.24.0"
+            ];
+          })
+          sources."oauth-sign-0.8.2"
+          sources."qs-6.3.0"
+          sources."stringstream-0.0.5"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
+          sources."tunnel-agent-0.4.3"
+        ];
+      })
+      sources."semver-5.3.0"
+      (sources."serve-favicon-2.3.0" // {
+        dependencies = [
+          sources."etag-1.7.0"
+          sources."fresh-0.3.0"
+          sources."ms-0.7.1"
+          sources."parseurl-1.3.1"
+        ];
+      })
+      sources."simplediff-0.1.1"
+      sources."yargs-1.3.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Mediawiki parser for the VisualEditor.";
+      homepage = "https://github.com/wikimedia/parsoid#readme";
+      license = "GPL-2.0+";
+    };
+    production = true;
+  };
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.35.1";
+    version = "0.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.35.1.tgz";
-      sha1 = "bcd9e77044e6f2c1f508d3cb913a39b8245fe072";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
+      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
     };
     dependencies = [
       (sources."airplayer-2.0.0" // {
@@ -31548,11 +32535,7 @@ in
                 dependencies = [
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -31583,7 +32566,7 @@ in
                 dependencies = [
                   (sources."dns-packet-1.1.0" // {
                     dependencies = [
-                      sources."ip-1.1.3"
+                      sources."ip-1.1.4"
                     ];
                   })
                   sources."thunky-0.1.0"
@@ -31629,7 +32612,7 @@ in
                               sources."spdx-license-ids-1.2.2"
                             ];
                           })
-                          sources."spdx-expression-parse-1.0.3"
+                          sources."spdx-expression-parse-1.0.4"
                         ];
                       })
                     ];
@@ -31651,7 +32634,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -31676,7 +32659,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.9"
+                              sources."graceful-fs-4.1.10"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -31720,10 +32703,10 @@ in
           sources."server-destroy-1.0.1"
         ];
       })
-      sources."clivas-0.1.4"
-      (sources."inquirer-0.8.5" // {
+      sources."clivas-0.2.0"
+      (sources."inquirer-1.2.2" // {
         dependencies = [
-          sources."ansi-regex-1.1.1"
+          sources."ansi-escapes-1.4.0"
           (sources."chalk-1.1.3" // {
             dependencies = [
               sources."ansi-styles-2.2.1"
@@ -31733,35 +32716,90 @@ in
                   sources."ansi-regex-2.0.0"
                 ];
               })
-              (sources."strip-ansi-3.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-2.0.0"
-                ];
-              })
               sources."supports-color-2.0.0"
             ];
           })
-          sources."cli-width-1.1.1"
+          (sources."cli-cursor-1.0.2" // {
+            dependencies = [
+              (sources."restore-cursor-1.0.1" // {
+                dependencies = [
+                  sources."exit-hook-1.1.1"
+                  sources."onetime-1.1.0"
+                ];
+              })
+            ];
+          })
+          sources."cli-width-2.1.0"
+          (sources."external-editor-1.1.1" // {
+            dependencies = [
+              sources."extend-3.0.0"
+              (sources."spawn-sync-1.0.15" // {
+                dependencies = [
+                  (sources."concat-stream-1.5.2" // {
+                    dependencies = [
+                      sources."inherits-2.0.3"
+                      sources."typedarray-0.0.6"
+                      (sources."readable-stream-2.0.6" // {
+                        dependencies = [
+                          sources."core-util-is-1.0.2"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."string_decoder-0.10.31"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."os-shim-0.1.3"
+                ];
+              })
+              (sources."tmp-0.0.29" // {
+                dependencies = [
+                  sources."os-tmpdir-1.0.2"
+                ];
+              })
+            ];
+          })
           (sources."figures-1.7.0" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
               sources."object-assign-4.1.0"
             ];
           })
-          sources."lodash-3.10.1"
-          (sources."readline2-0.1.1" // {
+          sources."lodash-4.16.6"
+          sources."mute-stream-0.0.6"
+          (sources."pinkie-promise-2.0.1" // {
             dependencies = [
-              sources."mute-stream-0.0.4"
-              sources."strip-ansi-2.0.1"
+              sources."pinkie-2.0.4"
+            ];
+          })
+          (sources."run-async-2.2.0" // {
+            dependencies = [
+              sources."is-promise-2.1.0"
+            ];
+          })
+          sources."rx-4.1.0"
+          (sources."string-width-1.0.2" // {
+            dependencies = [
+              sources."code-point-at-1.1.0"
+              (sources."is-fullwidth-code-point-1.0.0" // {
+                dependencies = [
+                  sources."number-is-nan-1.0.1"
+                ];
+              })
+            ];
+          })
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.0.0"
             ];
           })
-          sources."rx-2.5.3"
           sources."through-2.3.8"
         ];
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
-      sources."network-address-0.0.5"
+      sources."network-address-1.1.0"
       sources."numeral-1.5.3"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
@@ -31791,22 +32829,22 @@ in
               sources."uniq-1.0.1"
             ];
           })
-          (sources."simple-get-2.2.3" // {
+          (sources."simple-get-2.3.0" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
               })
-              sources."unzip-response-1.0.1"
+              sources."simple-concat-1.0.0"
+              sources."unzip-response-2.0.1"
             ];
           })
         ];
       })
-      (sources."pump-0.3.5" // {
+      (sources."pump-1.0.1" // {
         dependencies = [
-          sources."once-1.2.0"
-          (sources."end-of-stream-1.0.0" // {
+          (sources."end-of-stream-1.1.0" // {
             dependencies = [
               (sources."once-1.3.3" // {
                 dependencies = [
@@ -31815,15 +32853,20 @@ in
               })
             ];
           })
+          (sources."once-1.4.0" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."rc-0.4.0" // {
+      (sources."rc-1.1.6" // {
         dependencies = [
-          sources."minimist-0.0.10"
-          sources."deep-extend-0.2.11"
-          sources."strip-json-comments-0.1.3"
-          sources."ini-1.1.0"
+          sources."deep-extend-0.4.1"
+          sources."ini-1.3.4"
+          sources."minimist-1.2.0"
+          sources."strip-json-comments-1.0.4"
         ];
       })
       (sources."torrent-stream-1.0.3" // {
@@ -31860,7 +32903,7 @@ in
           sources."immediate-chunk-store-1.0.8"
           (sources."ip-set-1.0.1" // {
             dependencies = [
-              sources."ip-1.1.3"
+              sources."ip-1.1.4"
             ];
           })
           sources."mkdirp-0.3.5"
@@ -31915,10 +32958,10 @@ in
           })
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -31982,7 +33025,7 @@ in
                       sources."ipaddr.js-1.2.0"
                     ];
                   })
-                  sources."ip-1.1.3"
+                  sources."ip-1.1.4"
                   sources."minimist-1.2.0"
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -31991,9 +33034,10 @@ in
                   })
                   sources."random-iterate-1.0.1"
                   sources."run-series-1.1.4"
-                  (sources."simple-get-2.2.3" // {
+                  (sources."simple-get-2.3.0" // {
                     dependencies = [
-                      sources."unzip-response-1.0.1"
+                      sources."simple-concat-1.0.0"
+                      sources."unzip-response-2.0.1"
                     ];
                   })
                   (sources."simple-peer-6.0.7" // {
@@ -32343,7 +33387,7 @@ in
               sources."run-parallel-1.1.6"
               (sources."simple-get-1.4.3" // {
                 dependencies = [
-                  sources."unzip-response-1.0.1"
+                  sources."unzip-response-1.0.2"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32379,7 +33423,7 @@ in
               sources."run-series-1.1.4"
               (sources."simple-get-1.4.3" // {
                 dependencies = [
-                  sources."unzip-response-1.0.1"
+                  sources."unzip-response-1.0.2"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32410,7 +33454,7 @@ in
           sources."ip-0.3.3"
           (sources."ip-set-1.0.1" // {
             dependencies = [
-              sources."ip-1.1.3"
+              sources."ip-1.1.4"
             ];
           })
           (sources."magnet-uri-2.0.1" // {
@@ -32467,10 +33511,10 @@ in
           sources."random-access-file-0.3.2"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -32501,9 +33545,9 @@ in
       })
       (sources."fluent-ffmpeg-2.1.0" // {
         dependencies = [
-          (sources."async-2.0.1" // {
+          (sources."async-2.1.2" // {
             dependencies = [
-              sources."lodash-4.16.2"
+              sources."lodash-4.16.6"
             ];
           })
           (sources."which-1.2.11" // {
@@ -32567,16 +33611,16 @@ in
       })
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."jsonfile-2.4.0"
-          sources."klaw-1.3.0"
+          sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
           (sources."rimraf-2.5.4" // {
             dependencies = [
-              (sources."glob-7.1.0" // {
+              (sources."glob-7.1.1" // {
                 dependencies = [
                   sources."fs.realpath-1.0.0"
-                  (sources."inflight-1.0.5" // {
+                  (sources."inflight-1.0.6" // {
                     dependencies = [
                       sources."wrappy-1.0.2"
                     ];
@@ -32636,9 +33680,9 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.0.1" // {
+              (sources."async-2.1.2" // {
                 dependencies = [
-                  sources."lodash-4.16.2"
+                  sources."lodash-4.16.6"
                 ];
               })
             ];
@@ -32720,7 +33764,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -32728,7 +33772,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32776,15 +33820,15 @@ in
               sources."graceful-readlink-1.0.1"
             ];
           })
-          (sources."detective-4.3.1" // {
+          (sources."detective-4.3.2" // {
             dependencies = [
-              sources."acorn-1.2.2"
+              sources."acorn-3.3.0"
               sources."defined-1.0.0"
             ];
           })
           (sources."glob-5.0.15" // {
             dependencies = [
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -32808,7 +33852,7 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."iconv-lite-0.4.13"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
@@ -32832,7 +33876,7 @@ in
           sources."esprima-fb-13001.1001.0-dev-harmony-fb"
           (sources."source-map-0.1.31" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
         ];
@@ -32944,24 +33988,10 @@ in
           })
           (sources."openid-2.0.6" // {
             dependencies = [
-              (sources."request-2.75.0" // {
+              (sources."request-2.78.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.4.1"
-                  (sources."bl-1.1.2" // {
-                    dependencies = [
-                      (sources."readable-stream-2.0.6" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."aws4-1.5.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -32970,7 +34000,7 @@ in
                   })
                   sources."extend-3.0.0"
                   sources."forever-agent-0.6.1"
-                  (sources."form-data-2.0.0" // {
+                  (sources."form-data-2.1.1" // {
                     dependencies = [
                       sources."asynckit-0.4.0"
                     ];
@@ -32999,7 +34029,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.14.0" // {
+                      (sources."is-my-json-valid-2.15.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -33007,7 +34037,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-2.0.0"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -33061,9 +34091,13 @@ in
                   })
                   sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.2.1"
+                  sources."qs-6.3.0"
                   sources."stringstream-0.0.5"
-                  sources."tough-cookie-2.3.1"
+                  (sources."tough-cookie-2.3.2" // {
+                    dependencies = [
+                      sources."punycode-1.4.1"
+                    ];
+                  })
                   sources."tunnel-agent-0.4.3"
                 ];
               })
@@ -33074,7 +34108,7 @@ in
               sources."sax-1.2.1"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
-                  sources."lodash-4.16.2"
+                  sources."lodash-4.16.6"
                 ];
               })
             ];
@@ -33281,7 +34315,7 @@ in
             ];
           })
           sources."bytes-2.3.0"
-          (sources."compressible-2.0.8" // {
+          (sources."compressible-2.0.9" // {
             dependencies = [
               sources."mime-db-1.24.0"
             ];
@@ -33316,24 +34350,10 @@ in
           sources."keygrip-1.0.1"
         ];
       })
-      (sources."request-2.75.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.4.1"
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
+          sources."aws4-1.5.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -33342,7 +34362,7 @@ in
           })
           sources."extend-3.0.0"
           sources."forever-agent-0.6.1"
-          (sources."form-data-2.0.0" // {
+          (sources."form-data-2.1.1" // {
             dependencies = [
               sources."asynckit-0.4.0"
             ];
@@ -33366,7 +34386,7 @@ in
                   sources."supports-color-2.0.0"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -33374,7 +34394,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -33428,9 +34448,13 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
           sources."stringstream-0.0.5"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."tunnel-agent-0.4.3"
         ];
       })
@@ -33443,9 +34467,9 @@ in
           sources."sigmund-1.0.1"
         ];
       })
-      (sources."bunyan-1.8.1" // {
+      (sources."bunyan-1.8.4" // {
         dependencies = [
-          (sources."dtrace-provider-0.6.0" // {
+          (sources."dtrace-provider-0.7.1" // {
             dependencies = [
               sources."nan-2.4.0"
             ];
@@ -33457,7 +34481,7 @@ in
                 dependencies = [
                   (sources."glob-6.0.4" // {
                     dependencies = [
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -33486,7 +34510,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.15.1"
+          sources."moment-2.15.2"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -33501,7 +34525,7 @@ in
               sources."async-0.2.10"
               (sources."source-map-0.1.43" // {
                 dependencies = [
-                  sources."amdefine-1.0.0"
+                  sources."amdefine-1.0.1"
                 ];
               })
             ];
@@ -33509,7 +34533,7 @@ in
         ];
       })
       sources."highlight.js-8.9.1"
-      sources."lunr-0.7.1"
+      sources."lunr-0.7.2"
       (sources."render-readme-1.3.1" // {
         dependencies = [
           (sources."markdown-it-4.4.0" // {
@@ -33527,7 +34551,7 @@ in
           })
           (sources."sanitize-html-1.13.0" // {
             dependencies = [
-              (sources."htmlparser2-3.9.1" // {
+              (sources."htmlparser2-3.9.2" // {
                 dependencies = [
                   sources."domelementtype-1.3.0"
                   sources."domhandler-2.3.0"
@@ -33632,7 +34656,7 @@ in
       })
       (sources."readdirp-2.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           (sources."minimatch-3.0.3" // {
             dependencies = [
               (sources."brace-expansion-1.1.6" // {
@@ -33761,7 +34785,7 @@ in
                 dependencies = [
                   (sources."glob-6.0.4" // {
                     dependencies = [
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -33908,7 +34932,7 @@ in
       (sources."glob-7.0.6" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -33934,7 +34958,7 @@ in
       })
       (sources."source-map-0.1.43" // {
         dependencies = [
-          sources."amdefine-1.0.0"
+          sources."amdefine-1.0.1"
         ];
       })
     ];
@@ -34037,7 +35061,7 @@ in
             dependencies = [
               (sources."source-map-0.1.32" // {
                 dependencies = [
-                  sources."amdefine-1.0.0"
+                  sources."amdefine-1.0.1"
                 ];
               })
             ];
@@ -34077,9 +35101,9 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.0.1" // {
+                  (sources."async-2.1.2" // {
                     dependencies = [
-                      sources."lodash-4.16.2"
+                      sources."lodash-4.16.6"
                     ];
                   })
                 ];
@@ -34092,7 +35116,11 @@ in
               })
               sources."qs-4.0.0"
               sources."tunnel-agent-0.4.3"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               (sources."http-signature-0.11.0" // {
                 dependencies = [
                   sources."assert-plus-0.1.5"
@@ -34142,7 +35170,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -34150,7 +35178,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -34164,7 +35192,7 @@ in
               sources."async-0.2.10"
               (sources."source-map-0.1.34" // {
                 dependencies = [
-                  sources."amdefine-1.0.0"
+                  sources."amdefine-1.0.1"
                 ];
               })
               sources."uglify-to-browserify-1.0.2"
@@ -34202,9 +35230,9 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.0.1" // {
+              (sources."async-2.1.2" // {
                 dependencies = [
-                  sources."lodash-4.16.2"
+                  sources."lodash-4.16.6"
                 ];
               })
             ];
@@ -34218,7 +35246,11 @@ in
           sources."node-uuid-1.4.7"
           sources."qs-5.1.0"
           sources."tunnel-agent-0.4.3"
-          sources."tough-cookie-2.3.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           (sources."http-signature-0.11.0" // {
             dependencies = [
               sources."assert-plus-0.1.5"
@@ -34268,7 +35300,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.14.0" // {
+              (sources."is-my-json-valid-2.15.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -34276,7 +35308,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-2.0.0"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -34316,10 +35348,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.3";
+    version = "2.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz";
-      sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
+      sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -34332,10 +35364,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.3";
+    version = "2.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-      sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -34356,7 +35388,7 @@ in
                         ];
                       })
                       sources."longest-1.0.1"
-                      sources."repeat-string-1.5.4"
+                      sources."repeat-string-1.6.1"
                     ];
                   })
                   sources."lazy-cache-1.0.4"
@@ -34372,7 +35404,7 @@ in
                         ];
                       })
                       sources."longest-1.0.1"
-                      sources."repeat-string-1.5.4"
+                      sources."repeat-string-1.6.1"
                     ];
                   })
                 ];
@@ -34446,10 +35478,14 @@ in
           })
         ];
       })
-      (sources."color-0.11.3" // {
+      (sources."color-0.11.4" // {
         dependencies = [
           sources."clone-1.0.2"
-          sources."color-convert-1.5.0"
+          (sources."color-convert-1.6.0" // {
+            dependencies = [
+              sources."color-name-1.1.1"
+            ];
+          })
           (sources."color-string-0.3.0" // {
             dependencies = [
               sources."color-name-1.1.1"
@@ -34683,7 +35719,7 @@ in
           (sources."extract-opts-3.3.1" // {
             dependencies = [
               sources."eachr-3.2.0"
-              sources."editions-1.1.2"
+              sources."editions-1.3.1"
               sources."typechecker-4.3.0"
             ];
           })
@@ -34725,7 +35761,7 @@ in
               })
             ];
           })
-          (sources."config-chain-1.1.10" // {
+          (sources."config-chain-1.1.11" // {
             dependencies = [
               sources."proto-list-1.2.4"
             ];
@@ -34773,11 +35809,11 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           sources."has-unicode-2.0.1"
           sources."hosted-git-info-2.1.5"
           sources."iferr-0.1.5"
-          sources."inflight-1.0.5"
+          sources."inflight-1.0.6"
           sources."inherits-2.0.3"
           sources."ini-1.3.4"
           (sources."init-package-json-1.9.4" // {
@@ -34966,7 +36002,7 @@ in
           (sources."request-2.72.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
+              sources."aws4-1.5.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -35004,7 +36040,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -35012,7 +36048,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -35120,7 +36156,7 @@ in
                   sources."spdx-license-ids-1.2.2"
                 ];
               })
-              sources."spdx-expression-parse-1.0.3"
+              sources."spdx-expression-parse-1.0.4"
             ];
           })
         ];
@@ -35143,7 +36179,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
               sources."hosted-git-info-2.1.5"
@@ -35159,7 +36195,7 @@ in
                       sources."spdx-license-ids-1.2.2"
                     ];
                   })
-                  sources."spdx-expression-parse-1.0.3"
+                  sources."spdx-expression-parse-1.0.4"
                 ];
               })
             ];
@@ -35174,24 +36210,10 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."request-2.75.0" // {
+          (sources."request-2.78.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.4.1"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."inherits-2.0.3"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
+              sources."aws4-1.5.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -35200,7 +36222,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.0.0" // {
+              (sources."form-data-2.1.1" // {
                 dependencies = [
                   sources."asynckit-0.4.0"
                 ];
@@ -35229,7 +36251,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -35237,7 +36259,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -35291,9 +36313,13 @@ in
               })
               sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
@@ -35327,11 +36353,7 @@ in
                   sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
-                      (sources."code-point-at-1.0.1" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
+                      sources."code-point-at-1.1.0"
                       (sources."is-fullwidth-code-point-1.0.0" // {
                         dependencies = [
                           sources."number-is-nan-1.0.1"
@@ -35384,10 +36406,10 @@ in
       })
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          (sources."glob-7.1.0" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.5" // {
+              (sources."inflight-1.0.6" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
@@ -35675,7 +36697,7 @@ in
               })
               (sources."load-json-file-1.1.0" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.9"
+                  sources."graceful-fs-4.1.10"
                   (sources."parse-json-2.2.0" // {
                     dependencies = [
                       (sources."error-ex-1.3.0" // {
@@ -35718,7 +36740,7 @@ in
                 dependencies = [
                   (sources."load-json-file-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -35756,14 +36778,14 @@ in
                               sources."spdx-license-ids-1.2.2"
                             ];
                           })
-                          sources."spdx-expression-parse-1.0.3"
+                          sources."spdx-expression-parse-1.0.4"
                         ];
                       })
                     ];
                   })
                   (sources."path-type-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.9"
+                      sources."graceful-fs-4.1.10"
                       sources."pify-2.3.0"
                       (sources."pinkie-promise-2.0.1" // {
                         dependencies = [
@@ -35780,11 +36802,7 @@ in
           sources."set-blocking-1.0.0"
           (sources."string-width-1.0.2" // {
             dependencies = [
-              (sources."code-point-at-1.0.1" // {
-                dependencies = [
-                  sources."number-is-nan-1.0.1"
-                ];
-              })
+              sources."code-point-at-1.1.0"
               (sources."is-fullwidth-code-point-1.0.0" // {
                 dependencies = [
                   sources."number-is-nan-1.0.1"
@@ -35825,7 +36843,7 @@ in
       sources."mkdirp-0.3.5"
       (sources."npmconf-0.1.16" // {
         dependencies = [
-          (sources."config-chain-1.1.10" // {
+          (sources."config-chain-1.1.11" // {
             dependencies = [
               sources."proto-list-1.2.4"
               sources."ini-1.3.4"
@@ -35885,16 +36903,16 @@ in
           })
           (sources."fs-extra-0.26.7" // {
             dependencies = [
-              sources."graceful-fs-4.1.9"
+              sources."graceful-fs-4.1.10"
               sources."jsonfile-2.4.0"
-              sources."klaw-1.3.0"
+              sources."klaw-1.3.1"
               sources."path-is-absolute-1.0.1"
               (sources."rimraf-2.5.4" // {
                 dependencies = [
-                  (sources."glob-7.1.0" // {
+                  (sources."glob-7.1.1" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -35954,9 +36972,9 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.0.1" // {
+                  (sources."async-2.1.2" // {
                     dependencies = [
-                      sources."lodash-4.16.2"
+                      sources."lodash-4.16.6"
                     ];
                   })
                 ];
@@ -36038,7 +37056,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.14.0" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -36046,7 +37064,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -36071,7 +37089,7 @@ in
           })
         ];
       })
-      (sources."tmp-0.0.29" // {
+      (sources."tmp-0.0.30" // {
         dependencies = [
           sources."os-tmpdir-1.0.2"
         ];
@@ -36093,10 +37111,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.2";
+    version = "1.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.2.tgz";
-      sha1 = "f11a96f458eb752970a86abe746c0704fabafaf3";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
+      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
     };
     dependencies = [
       sources."async-1.5.2"
@@ -36104,7 +37122,7 @@ in
       (sources."enhanced-resolve-0.9.1" // {
         dependencies = [
           sources."memory-fs-0.2.0"
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       sources."acorn-3.3.0"
@@ -36112,7 +37130,7 @@ in
       (sources."loader-utils-0.2.16" // {
         dependencies = [
           sources."big.js-3.1.3"
-          sources."emojis-list-2.0.1"
+          sources."emojis-list-2.1.0"
           sources."json5-0.5.0"
           sources."object-assign-4.1.0"
         ];
@@ -36153,7 +37171,7 @@ in
           (sources."buffer-4.9.1" // {
             dependencies = [
               sources."base64-js-1.2.0"
-              sources."ieee754-1.1.6"
+              sources."ieee754-1.1.8"
               sources."isarray-1.0.0"
             ];
           })
@@ -36229,7 +37247,7 @@ in
         ];
       })
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.6.4" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -36249,7 +37267,7 @@ in
                             ];
                           })
                           sources."longest-1.0.1"
-                          sources."repeat-string-1.5.4"
+                          sources."repeat-string-1.6.1"
                         ];
                       })
                       sources."lazy-cache-1.0.4"
@@ -36265,7 +37283,7 @@ in
                             ];
                           })
                           sources."longest-1.0.1"
-                          sources."repeat-string-1.5.4"
+                          sources."repeat-string-1.6.1"
                         ];
                       })
                     ];
@@ -36282,7 +37300,7 @@ in
       (sources."watchpack-0.2.9" // {
         dependencies = [
           sources."async-0.9.2"
-          (sources."chokidar-1.6.0" // {
+          (sources."chokidar-1.6.1" // {
             dependencies = [
               (sources."anymatch-1.3.0" // {
                 dependencies = [
@@ -36308,7 +37326,7 @@ in
                                     ];
                                   })
                                   sources."randomatic-1.1.5"
-                                  sources."repeat-string-1.5.4"
+                                  sources."repeat-string-1.6.1"
                                 ];
                               })
                             ];
@@ -36331,7 +37349,7 @@ in
                         ];
                       })
                       sources."normalize-path-2.0.1"
-                      (sources."object.omit-2.0.0" // {
+                      (sources."object.omit-2.0.1" // {
                         dependencies = [
                           (sources."for-own-0.1.4" // {
                             dependencies = [
@@ -36362,7 +37380,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.6.0"
+                  sources."binary-extensions-1.7.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -36396,10 +37414,10 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.14" // {
+              (sources."fsevents-1.0.15" // {
                 dependencies = [
                   sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.30" // {
+                  (sources."node-pre-gyp-0.6.31" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
@@ -36433,11 +37451,7 @@ in
                               sources."signal-exit-3.0.1"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
-                                  (sources."code-point-at-1.0.1" // {
-                                    dependencies = [
-                                      sources."number-is-nan-1.0.1"
-                                    ];
-                                  })
+                                  sources."code-point-at-1.1.0"
                                   (sources."is-fullwidth-code-point-1.0.0" // {
                                     dependencies = [
                                       sources."number-is-nan-1.0.1"
@@ -36464,23 +37478,10 @@ in
                           sources."strip-json-comments-1.0.4"
                         ];
                       })
-                      (sources."request-2.75.0" // {
+                      (sources."request-2.78.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.4.1"
-                          (sources."bl-1.1.2" // {
-                            dependencies = [
-                              (sources."readable-stream-2.0.6" // {
-                                dependencies = [
-                                  sources."core-util-is-1.0.2"
-                                  sources."isarray-1.0.0"
-                                  sources."process-nextick-args-1.0.7"
-                                  sources."string_decoder-0.10.31"
-                                  sources."util-deprecate-1.0.2"
-                                ];
-                              })
-                            ];
-                          })
+                          sources."aws4-1.5.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -36489,7 +37490,7 @@ in
                           })
                           sources."extend-3.0.0"
                           sources."forever-agent-0.6.1"
-                          (sources."form-data-2.0.0" // {
+                          (sources."form-data-2.1.1" // {
                             dependencies = [
                               sources."asynckit-0.4.0"
                             ];
@@ -36518,7 +37519,7 @@ in
                                   sources."graceful-readlink-1.0.1"
                                 ];
                               })
-                              (sources."is-my-json-valid-2.14.0" // {
+                              (sources."is-my-json-valid-2.15.0" // {
                                 dependencies = [
                                   sources."generate-function-2.0.0"
                                   (sources."generate-object-property-1.2.0" // {
@@ -36526,7 +37527,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-2.0.0"
+                                  sources."jsonpointer-4.0.0"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -36580,18 +37581,22 @@ in
                           })
                           sources."node-uuid-1.4.7"
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.2.1"
+                          sources."qs-6.3.0"
                           sources."stringstream-0.0.5"
-                          sources."tough-cookie-2.3.1"
+                          (sources."tough-cookie-2.3.2" // {
+                            dependencies = [
+                              sources."punycode-1.4.1"
+                            ];
+                          })
                           sources."tunnel-agent-0.4.3"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
                         dependencies = [
-                          (sources."glob-7.1.0" // {
+                          (sources."glob-7.1.1" // {
                             dependencies = [
                               sources."fs.realpath-1.0.0"
-                              (sources."inflight-1.0.5" // {
+                              (sources."inflight-1.0.6" // {
                                 dependencies = [
                                   sources."wrappy-1.0.2"
                                 ];
@@ -36622,7 +37627,7 @@ in
                           sources."fstream-1.0.10"
                         ];
                       })
-                      (sources."tar-pack-3.1.4" // {
+                      (sources."tar-pack-3.3.0" // {
                         dependencies = [
                           (sources."debug-2.2.0" // {
                             dependencies = [
@@ -36668,14 +37673,14 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.9"
+          sources."graceful-fs-4.1.10"
         ];
       })
       (sources."webpack-core-0.6.8" // {
         dependencies = [
           (sources."source-map-0.4.4" // {
             dependencies = [
-              sources."amdefine-1.0.0"
+              sources."amdefine-1.0.1"
             ];
           })
           sources."source-list-map-0.1.6"
diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v6.nix
similarity index 94%
rename from pkgs/development/node-packages/node-packages-v5.nix
rename to pkgs/development/node-packages/node-packages-v6.nix
index fe1eb1769ea..b2202168ef6 100644
--- a/pkgs/development/node-packages/node-packages-v5.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -517,13 +517,13 @@ let
         sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2";
       };
     };
-    "azure-arm-website-0.11.0" = {
+    "azure-arm-website-0.11.4" = {
       name = "azure-arm-website";
       packageName = "azure-arm-website";
-      version = "0.11.0";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz";
-        sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79";
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz";
+        sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
     "azure-arm-rediscache-0.2.1" = {
@@ -580,13 +580,13 @@ let
         sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
       };
     };
-    "azure-keyvault-0.10.2" = {
+    "azure-keyvault-0.11.0" = {
       name = "azure-keyvault";
       packageName = "azure-keyvault";
-      version = "0.10.2";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz";
-        sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz";
+        sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
       };
     };
     "azure-asm-compute-0.17.0" = {
@@ -715,13 +715,13 @@ let
         sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce";
       };
     };
-    "azure-arm-batch-0.2.0" = {
+    "azure-arm-batch-0.3.0" = {
       name = "azure-arm-batch";
       packageName = "azure-arm-batch";
-      version = "0.2.0";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.2.0.tgz";
-        sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d";
+        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz";
+        sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7";
       };
     };
     "azure-batch-0.5.2" = {
@@ -859,40 +859,40 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
-    "kuduscript-1.0.8" = {
+    "kuduscript-1.0.9" = {
       name = "kuduscript";
       packageName = "kuduscript";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.8.tgz";
-        sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz";
+        sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.15.1" = {
+    "moment-2.15.2" = {
       name = "moment";
       packageName = "moment";
-      version = "2.15.1";
+      version = "2.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz";
-        sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c";
+        url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz";
+        sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc";
       };
     };
-    "ms-rest-1.15.0" = {
+    "ms-rest-1.15.2" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.0";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.0.tgz";
-        sha1 = "78e28043d6345d76916f9a63c46d9213cb34d54c";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz";
+        sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff";
       };
     };
-    "ms-rest-azure-1.15.0" = {
+    "ms-rest-azure-1.15.2" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.0";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.0.tgz";
-        sha1 = "72d7f874d7bdd4e52768666b34f8dfeb3f9ad9f8";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz";
+        sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83";
       };
     };
     "node-forge-0.6.23" = {
@@ -1336,13 +1336,13 @@ let
         sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
       };
     };
-    "base64-url-1.3.2" = {
+    "base64-url-1.3.3" = {
       name = "base64-url";
       packageName = "base64-url";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz";
-        sha1 = "4b08113b49d23889f306be64372762d31412f7a8";
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
       };
     };
     "xml2js-0.2.7" = {
@@ -1705,13 +1705,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "glob-7.1.0" = {
+    "glob-7.1.1" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz";
-        sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
+        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -1723,13 +1723,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "inflight-1.0.5" = {
+    "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz";
-        sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a";
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
       };
     };
     "minimatch-3.0.3" = {
@@ -1840,13 +1840,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.4.1" = {
+    "aws4-1.5.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz";
-        sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
+        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
       };
     };
     "bl-1.1.2" = {
@@ -1984,13 +1984,13 @@ let
         sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "tough-cookie-2.3.1" = {
+    "tough-cookie-2.3.2" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz";
-        sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
+        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -2011,22 +2011,22 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.0.1" = {
+    "async-2.1.2" = {
       name = "async";
       packageName = "async";
-      version = "2.0.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "lodash-4.16.2" = {
+    "lodash-4.16.4" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.16.2";
+      version = "4.16.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz";
-        sha1 = "3e626db827048a699281a8a125226326cfc0e652";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz";
+        sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127";
       };
     };
     "chalk-1.1.3" = {
@@ -2047,13 +2047,13 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "is-my-json-valid-2.14.0" = {
+    "is-my-json-valid-2.15.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.14.0";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz";
-        sha1 = "47bf808609b2df5d48c969c74becd09fbca02725";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
+        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2146,13 +2146,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-2.0.0" = {
+    "jsonpointer-4.0.0" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "2.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
-        sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
+        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
       };
     };
     "xtend-4.0.1" = {
@@ -2362,6 +2362,15 @@ let
         sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c";
       };
     };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
     "asn1-0.1.11" = {
       name = "asn1";
       packageName = "asn1";
@@ -2389,13 +2398,13 @@ let
         sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
       };
     };
-    "fibers-1.0.14" = {
+    "fibers-1.0.15" = {
       name = "fibers";
       packageName = "fibers";
-      version = "1.0.14";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.14.tgz";
-        sha1 = "824bc9a950691a0b2a52c30a69ddf62bc158d1ca";
+        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
+        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
       };
     };
     "galaxy-0.1.12" = {
@@ -2668,13 +2677,13 @@ let
         sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee";
       };
     };
-    "duplexify-3.4.5" = {
+    "duplexify-3.5.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.4.5";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.4.5.tgz";
-        sha1 = "0e7e287a775af753bf57e6e7b7f21f183f6c3a53";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
+        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -2956,13 +2965,13 @@ let
         sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
       };
     };
-    "spdx-expression-parse-1.0.3" = {
+    "spdx-expression-parse-1.0.4" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz";
-        sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
+        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
       };
     };
     "spdx-license-ids-1.2.2" = {
@@ -3145,13 +3154,13 @@ let
         sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
-    "klaw-1.3.0" = {
+    "klaw-1.3.1" = {
       name = "klaw";
       packageName = "klaw";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.0.tgz";
-        sha1 = "8857bfbc1d824badf13d3d0241d8bbe46fb12f73";
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
       };
     };
     "q-1.4.1" = {
@@ -3244,6 +3253,15 @@ let
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
+    "cached-path-relative-1.0.0" = {
+      name = "cached-path-relative";
+      packageName = "cached-path-relative";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz";
+        sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
+      };
+    };
     "concat-stream-1.5.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -3379,13 +3397,13 @@ let
         sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
       };
     };
-    "module-deps-4.0.7" = {
+    "module-deps-4.0.8" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "4.0.7";
+      version = "4.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.7.tgz";
-        sha1 = "edfeb3937be7359bc14a6672c22ef124887f6ed2";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz";
+        sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb";
       };
     };
     "os-browserify-0.1.2" = {
@@ -3424,15 +3442,6 @@ let
         sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1";
       };
     };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
     "querystring-es3-0.2.1" = {
       name = "querystring-es3";
       packageName = "querystring-es3";
@@ -3478,13 +3487,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.4.0" = {
+    "stream-http-2.4.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz";
-        sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz";
+        sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59";
       };
     };
     "subarg-1.0.0" = {
@@ -3640,13 +3649,13 @@ let
         sha1 = "a39992d723584811982be5e290bb6a53d86700f1";
       };
     };
-    "ieee754-1.1.6" = {
+    "ieee754-1.1.8" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.6";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz";
-        sha1 = "2e1013219c6d6712973ec54d981ec19e5579de97";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
+        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
       };
     };
     "date-now-0.1.4" = {
@@ -3712,13 +3721,13 @@ let
         sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
       };
     };
-    "pbkdf2-3.0.8" = {
+    "pbkdf2-3.0.9" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.8";
+      version = "3.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz";
-        sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz";
+        sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3946,13 +3955,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.3.1" = {
+    "detective-4.3.2" = {
       name = "detective";
       packageName = "detective";
-      version = "4.3.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz";
-        sha1 = "9fb06dd1ee8f0ea4dbcc607cda39d9ce1d4f726f";
+        url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz";
+        sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -3964,6 +3973,15 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
     "path-platform-0.11.15" = {
       name = "path-platform";
       packageName = "path-platform";
@@ -4720,13 +4738,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.2.3" = {
+    "simple-get-2.3.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.2.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz";
-        sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
+        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4774,13 +4792,22 @@ let
         sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
       };
     };
-    "unzip-response-1.0.1" = {
+    "simple-concat-1.0.0" = {
+      name = "simple-concat";
+      packageName = "simple-concat";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz";
+        sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
+      };
+    };
+    "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
-      version = "1.0.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz";
-        sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412";
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
     "once-1.2.0" = {
@@ -5557,31 +5584,31 @@ let
         sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
       };
     };
-    "cordova-lib-6.3.1" = {
-      name = "cordova-lib";
-      packageName = "cordova-lib";
-      version = "6.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.3.1.tgz";
-        sha1 = "728b637cd6f6765f2c8727d4d09a650590ef217c";
-      };
-    };
-    "cordova-common-1.4.1" = {
+    "cordova-common-1.5.1" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "1.4.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.4.1.tgz";
-        sha1 = "8b4f07b3199b398fff553b32bff66676ecd30ab9";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz";
+        sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3";
       };
     };
-    "q-1.0.1" = {
-      name = "q";
-      packageName = "q";
-      version = "1.0.1";
+    "cordova-lib-6.4.0" = {
+      name = "cordova-lib";
+      packageName = "cordova-lib";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz";
-        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz";
+        sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
+      };
+    };
+    "insight-0.8.3" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
+        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
       };
     };
     "nopt-3.0.1" = {
@@ -5593,6 +5620,15 @@ let
         sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
       };
     };
+    "q-1.0.1" = {
+      name = "q";
+      packageName = "q";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz";
+        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+      };
+    };
     "underscore-1.7.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -5611,13 +5647,112 @@ let
         sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
       };
     };
-    "insight-0.8.3" = {
-      name = "insight";
-      packageName = "insight";
-      version = "0.8.3";
+    "ansi-0.3.1" = {
+      name = "ansi";
+      packageName = "ansi";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz";
+        sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
+      };
+    };
+    "bplist-parser-0.1.1" = {
+      name = "bplist-parser";
+      packageName = "bplist-parser";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz";
+        sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
+      };
+    };
+    "cordova-registry-mapper-1.1.15" = {
+      name = "cordova-registry-mapper";
+      packageName = "cordova-registry-mapper";
+      version = "1.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
+        sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
+      };
+    };
+    "elementtree-0.1.6" = {
+      name = "elementtree";
+      packageName = "elementtree";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
+        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
+      };
+    };
+    "plist-1.2.0" = {
+      name = "plist";
+      packageName = "plist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
+        sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593";
+      };
+    };
+    "shelljs-0.5.3" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz";
+        sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113";
+      };
+    };
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+      };
+    };
+    "unorm-1.4.1" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz";
+        sha1 = "364200d5f13646ca8bcd44490271335614792300";
+      };
+    };
+    "big-integer-1.6.16" = {
+      name = "big-integer";
+      packageName = "big-integer";
+      version = "1.6.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
+        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+      };
+    };
+    "sax-0.3.5" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+      };
+    };
+    "base64-js-0.0.8" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
+        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
+      };
+    };
+    "xmlbuilder-4.0.0" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
+        sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
       };
     };
     "aliasify-1.9.0" = {
@@ -5629,15 +5764,6 @@ let
         sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030";
       };
     };
-    "cordova-app-hello-world-3.10.0" = {
-      name = "cordova-app-hello-world";
-      packageName = "cordova-app-hello-world";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.10.0.tgz";
-        sha1 = "e3825fc6ca950090a6a37437fcfb88c1622fd80e";
-      };
-    };
     "cordova-fetch-1.0.1" = {
       name = "cordova-fetch";
       packageName = "cordova-fetch";
@@ -5647,22 +5773,22 @@ let
         sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769";
       };
     };
-    "cordova-js-4.1.4" = {
-      name = "cordova-js";
-      packageName = "cordova-js";
-      version = "4.1.4";
+    "cordova-create-1.0.1" = {
+      name = "cordova-create";
+      packageName = "cordova-create";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.1.4.tgz";
-        sha1 = "33c67efcc751a4b36d91301c2e5bd409003daf13";
+        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz";
+        sha1 = "f1810401807ceec436ece27241180a83c97f8212";
       };
     };
-    "cordova-registry-mapper-1.1.15" = {
-      name = "cordova-registry-mapper";
-      packageName = "cordova-registry-mapper";
-      version = "1.1.15";
+    "cordova-js-4.2.0" = {
+      name = "cordova-js";
+      packageName = "cordova-js";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
-        sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz";
+        sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
     "cordova-serve-1.0.0" = {
@@ -5683,15 +5809,6 @@ let
         sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
       };
     };
-    "elementtree-0.1.6" = {
-      name = "elementtree";
-      packageName = "elementtree";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
-        sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
-      };
-    };
     "init-package-json-1.9.4" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -5728,15 +5845,6 @@ let
         sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895";
       };
     };
-    "plist-1.2.0" = {
-      name = "plist";
-      packageName = "plist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
-        sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593";
-      };
-    };
     "properties-parser-0.2.3" = {
       name = "properties-parser";
       packageName = "properties-parser";
@@ -5863,13 +5971,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.4" = {
+    "shelljs-0.7.5" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.4";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.4.tgz";
-        sha1 = "b8f04b3a74ddfafea22acf98e0be45ded53d59c8";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
+        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
       };
     };
     "interpret-1.0.1" = {
@@ -5890,319 +5998,22 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "browserify-10.1.3" = {
+    "cordova-app-hello-world-3.11.0" = {
+      name = "cordova-app-hello-world";
+      packageName = "cordova-app-hello-world";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz";
+        sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf";
+      };
+    };
+    "browserify-13.1.0" = {
       name = "browserify";
       packageName = "browserify";
-      version = "10.1.3";
+      version = "13.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz";
-        sha1 = "6605dcffbb918c6a69d9c60201d2397ef7ce20ff";
-      };
-    };
-    "browser-pack-4.0.4" = {
-      name = "browser-pack";
-      packageName = "browser-pack";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz";
-        sha1 = "8dae95a20ca43b3fea201faa6cfaa84ff4a0d484";
-      };
-    };
-    "buffer-3.6.0" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
-        sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
-      };
-    };
-    "builtins-0.0.7" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
-      };
-    };
-    "commondir-0.0.1" = {
-      name = "commondir";
-      packageName = "commondir";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
-        sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
-      };
-    };
-    "constants-browserify-0.0.1" = {
-      name = "constants-browserify";
-      packageName = "constants-browserify";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
-        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
-      };
-    };
-    "deps-sort-1.3.9" = {
-      name = "deps-sort";
-      packageName = "deps-sort";
-      version = "1.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz";
-        sha1 = "29dfff53e17b36aecae7530adbbbf622c2ed1a71";
-      };
-    };
-    "duplexer2-0.0.2" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
-        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
-      };
-    };
-    "events-1.0.2" = {
-      name = "events";
-      packageName = "events";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.0.2.tgz";
-        sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
-      };
-    };
-    "glob-4.5.3" = {
-      name = "glob";
-      packageName = "glob";
-      version = "4.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
-        sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
-      };
-    };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
-      };
-    };
-    "insert-module-globals-6.6.3" = {
-      name = "insert-module-globals";
-      packageName = "insert-module-globals";
-      version = "6.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz";
-        sha1 = "20638e29a30f9ed1ca2e3a825fbc2cba5246ddfc";
-      };
-    };
-    "labeled-stream-splicer-1.0.2" = {
-      name = "labeled-stream-splicer";
-      packageName = "labeled-stream-splicer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
-        sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65";
-      };
-    };
-    "module-deps-3.9.1" = {
-      name = "module-deps";
-      packageName = "module-deps";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz";
-        sha1 = "ea75caf9199090d25b0d5512b5acacb96e7f87f3";
-      };
-    };
-    "read-only-stream-1.1.1" = {
-      name = "read-only-stream";
-      packageName = "read-only-stream";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz";
-        sha1 = "5da77c799ed1388d3ef88a18471bb5924f8a0ba1";
-      };
-    };
-    "shallow-copy-0.0.1" = {
-      name = "shallow-copy";
-      packageName = "shallow-copy";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
-        sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
-      };
-    };
-    "shell-quote-0.0.1" = {
-      name = "shell-quote";
-      packageName = "shell-quote";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
-        sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
-      };
-    };
-    "stream-browserify-1.0.0" = {
-      name = "stream-browserify";
-      packageName = "stream-browserify";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
-        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
-      };
-    };
-    "through2-1.1.1" = {
-      name = "through2";
-      packageName = "through2";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
-        sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
-      };
-    };
-    "url-0.10.3" = {
-      name = "url";
-      packageName = "url";
-      version = "0.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
-        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
-      };
-    };
-    "combine-source-map-0.3.0" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
-        sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
-      };
-    };
-    "through2-0.5.1" = {
-      name = "through2";
-      packageName = "through2";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
-        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
-      };
-    };
-    "inline-source-map-0.3.1" = {
-      name = "inline-source-map";
-      packageName = "inline-source-map";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz";
-        sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
-      };
-    };
-    "convert-source-map-0.3.5" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
-        sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
-      };
-    };
-    "source-map-0.3.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
-        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
-      };
-    };
-    "xtend-3.0.0" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
-        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
-      };
-    };
-    "base64-js-0.0.8" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
-        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
-      };
-    };
-    "minimatch-2.0.10" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "2.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
-        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
-      };
-    };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
-      };
-    };
-    "combine-source-map-0.6.1" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz";
-        sha1 = "9b4a09c316033d768e0f11e029fa2730e079ad96";
-      };
-    };
-    "inline-source-map-0.5.0" = {
-      name = "inline-source-map";
-      packageName = "inline-source-map";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz";
-        sha1 = "4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af";
-      };
-    };
-    "source-map-0.4.4" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
-        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
-      };
-    };
-    "stream-splicer-1.3.2" = {
-      name = "stream-splicer";
-      packageName = "stream-splicer";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz";
-        sha1 = "3c0441be15b9bf4e226275e6dc83964745546661";
-      };
-    };
-    "readable-wrap-1.0.0" = {
-      name = "readable-wrap";
-      packageName = "readable-wrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
-        sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
-      };
-    };
-    "stream-combiner2-1.0.2" = {
-      name = "stream-combiner2";
-      packageName = "stream-combiner2";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
-        sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
+        url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
+        sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
     "compression-1.6.2" = {
@@ -6556,15 +6367,6 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
-    "sax-0.3.5" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
-        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
-      };
-    };
     "npm-package-arg-4.2.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -6619,6 +6421,15 @@ let
         sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
       };
     };
+    "builtins-0.0.7" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      };
+    };
     "abbrev-1.0.9" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -6628,15 +6439,6 @@ let
         sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
       };
     };
-    "ansi-0.3.1" = {
-      name = "ansi";
-      packageName = "ansi";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz";
-        sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
-      };
-    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -6727,13 +6529,13 @@ let
         sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
       };
     };
-    "config-chain-1.1.10" = {
+    "config-chain-1.1.11" = {
       name = "config-chain";
       packageName = "config-chain";
-      version = "1.1.10";
+      version = "1.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz";
-        sha1 = "7fc383de0fcc84d711cb465bd176579cad612346";
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
       };
     };
     "dezalgo-1.0.3" = {
@@ -7150,22 +6952,31 @@ let
         sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
       };
     };
-    "request-2.75.0" = {
+    "request-2.76.0" = {
       name = "request";
       packageName = "request";
-      version = "2.75.0";
+      version = "2.76.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+        url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz";
+        sha1 = "be44505afef70360a0436955106be3945d95560e";
       };
     };
-    "form-data-2.0.0" = {
+    "form-data-2.1.1" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz";
+        sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3";
+      };
+    };
+    "qs-6.3.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
+        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
     "asynckit-0.4.0" = {
@@ -7267,15 +7078,6 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
-    "xmlbuilder-4.0.0" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
-        sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
-      };
-    };
     "bl-0.9.5" = {
       name = "bl";
       packageName = "bl";
@@ -7474,40 +7276,13 @@ let
         sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc";
       };
     };
-    "bplist-parser-0.1.1" = {
-      name = "bplist-parser";
-      packageName = "bplist-parser";
-      version = "0.1.1";
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz";
-        sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
-      };
-    };
-    "shelljs-0.5.3" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz";
-        sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113";
-      };
-    };
-    "underscore-1.8.3" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-      };
-    };
-    "big-integer-1.6.16" = {
-      name = "big-integer";
-      packageName = "big-integer";
-      version = "1.6.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz";
-        sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc";
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
     "configstore-1.4.0" = {
@@ -7519,141 +7294,6 @@ let
         sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021";
       };
     };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
-      };
-    };
-    "latest-version-1.0.1" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
-        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
-      };
-    };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
-      };
-    };
-    "string-length-1.0.1" = {
-      name = "string-length";
-      packageName = "string-length";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
-        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
-      };
-    };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
-      };
-    };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
-      };
-    };
-    "package-json-1.2.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
-        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
-      };
-    };
-    "got-3.3.1" = {
-      name = "got";
-      packageName = "got";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
-        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
-      };
-    };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
-      };
-    };
-    "is-redirect-1.0.0" = {
-      name = "is-redirect";
-      packageName = "is-redirect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
-      };
-    };
-    "object-assign-3.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
-        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
-      };
-    };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
-      };
-    };
-    "rc-1.1.6" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
-        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
-      };
-    };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
-      };
-    };
-    "async-1.5.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
-      };
-    };
     "inquirer-0.10.1" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -7681,6 +7321,24 @@ let
         sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
       };
     };
+    "uuid-2.0.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
+      };
+    };
+    "xdg-basedir-2.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
+      };
+    };
     "ansi-escapes-1.4.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -7807,6 +7465,114 @@ let
         sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
       };
     };
+    "is-npm-1.0.0" = {
+      name = "is-npm";
+      packageName = "is-npm";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+      };
+    };
+    "latest-version-1.0.1" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
+        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
+      };
+    };
+    "semver-diff-2.1.0" = {
+      name = "semver-diff";
+      packageName = "semver-diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    };
+    "string-length-1.0.1" = {
+      name = "string-length";
+      packageName = "string-length";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
+        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
+      };
+    };
+    "package-json-1.2.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
+        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
+      };
+    };
+    "got-3.3.1" = {
+      name = "got";
+      packageName = "got";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
+        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
+      };
+    };
+    "registry-url-3.1.0" = {
+      name = "registry-url";
+      packageName = "registry-url";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+      };
+    };
+    "is-redirect-1.0.0" = {
+      name = "is-redirect";
+      packageName = "is-redirect";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+      };
+    };
+    "object-assign-3.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+      };
+    };
+    "read-all-stream-3.1.0" = {
+      name = "read-all-stream";
+      packageName = "read-all-stream";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
+        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+      };
+    };
+    "rc-1.1.6" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
+        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
     "parserlib-1.0.0" = {
       name = "parserlib";
       packageName = "parserlib";
@@ -8522,13 +8288,13 @@ let
         sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
       };
     };
-    "level-sublevel-6.6.0" = {
+    "level-sublevel-6.6.1" = {
       name = "level-sublevel";
       packageName = "level-sublevel";
-      version = "6.6.0";
+      version = "6.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz";
-        sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f";
+        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz";
+        sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485";
       };
     };
     "leveldown-0.10.6" = {
@@ -8693,22 +8459,13 @@ let
         sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
       };
     };
-    "pull-stream-2.21.0" = {
-      name = "pull-stream";
-      packageName = "pull-stream";
-      version = "2.21.0";
+    "bytewise-1.1.0" = {
+      name = "bytewise";
+      packageName = "bytewise";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.21.0.tgz";
-        sha1 = "5b04e0bb35ffe64744fa9bb68465a84f9e1fe5d1";
-      };
-    };
-    "ltgt-2.1.2" = {
-      name = "ltgt";
-      packageName = "ltgt";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
-        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+        url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz";
+        sha1 = "1d13cbff717ae7158094aa881b35d081b387253e";
       };
     };
     "levelup-0.19.1" = {
@@ -8720,13 +8477,31 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
-    "bytewise-1.1.0" = {
-      name = "bytewise";
-      packageName = "bytewise";
-      version = "1.1.0";
+    "ltgt-2.1.2" = {
+      name = "ltgt";
+      packageName = "ltgt";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz";
-        sha1 = "1d13cbff717ae7158094aa881b35d081b387253e";
+        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
+        sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
+      };
+    };
+    "pull-level-2.0.3" = {
+      name = "pull-level";
+      packageName = "pull-level";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz";
+        sha1 = "9500635e257945d6feede185f5d7a24773455b17";
+      };
+    };
+    "pull-stream-3.4.5" = {
+      name = "pull-stream";
+      packageName = "pull-stream";
+      version = "3.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz";
+        sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72";
       };
     };
     "typewiselite-1.0.0" = {
@@ -8738,13 +8513,31 @@ let
         sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e";
       };
     };
-    "pull-core-1.0.0" = {
-      name = "pull-core";
-      packageName = "pull-core";
-      version = "1.0.0";
+    "bytewise-core-1.2.3" = {
+      name = "bytewise-core";
+      packageName = "bytewise-core";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-core/-/pull-core-1.0.0.tgz";
-        sha1 = "e0eb93918dfa70963ed09e36f63daa15b76b38a4";
+        url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz";
+        sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
+      };
+    };
+    "typewise-1.0.3" = {
+      name = "typewise";
+      packageName = "typewise";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz";
+        sha1 = "1067936540af97937cc5dcf9922486e9fa284651";
+      };
+    };
+    "typewise-core-1.2.0" = {
+      name = "typewise-core";
+      packageName = "typewise-core";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz";
+        sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195";
       };
     };
     "bl-0.8.2" = {
@@ -8783,6 +8576,15 @@ let
         sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
       };
     };
+    "xtend-3.0.0" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      };
+    };
     "abstract-leveldown-0.12.4" = {
       name = "abstract-leveldown";
       packageName = "abstract-leveldown";
@@ -8792,31 +8594,76 @@ let
         sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
       };
     };
-    "bytewise-core-1.2.3" = {
-      name = "bytewise-core";
-      packageName = "bytewise-core";
-      version = "1.2.3";
+    "level-post-1.0.5" = {
+      name = "level-post";
+      packageName = "level-post";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz";
-        sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
+        url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz";
+        sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c";
       };
     };
-    "typewise-1.0.3" = {
-      name = "typewise";
-      packageName = "typewise";
-      version = "1.0.3";
+    "pull-cat-1.1.11" = {
+      name = "pull-cat";
+      packageName = "pull-cat";
+      version = "1.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz";
-        sha1 = "1067936540af97937cc5dcf9922486e9fa284651";
+        url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz";
+        sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
       };
     };
-    "typewise-core-1.2.0" = {
-      name = "typewise-core";
-      packageName = "typewise-core";
-      version = "1.2.0";
+    "pull-live-1.0.1" = {
+      name = "pull-live";
+      packageName = "pull-live";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz";
-        sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195";
+        url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz";
+        sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5";
+      };
+    };
+    "pull-pushable-2.0.1" = {
+      name = "pull-pushable";
+      packageName = "pull-pushable";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.0.1.tgz";
+        sha1 = "02bdca51a39cf585f483fbecde2fc9378076f212";
+      };
+    };
+    "pull-window-2.1.4" = {
+      name = "pull-window";
+      packageName = "pull-window";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz";
+        sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0";
+      };
+    };
+    "stream-to-pull-stream-1.7.2" = {
+      name = "stream-to-pull-stream";
+      packageName = "stream-to-pull-stream";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz";
+        sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde";
+      };
+    };
+    "looper-2.0.0" = {
+      name = "looper";
+      packageName = "looper";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz";
+        sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec";
+      };
+    };
+    "looper-3.0.0" = {
+      name = "looper";
+      packageName = "looper";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz";
+        sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
       };
     };
     "nan-2.1.0" = {
@@ -8873,6 +8720,15 @@ let
         sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
       };
     };
+    "async-2.0.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
+        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+      };
+    };
     "got-6.5.0" = {
       name = "got";
       packageName = "got";
@@ -8954,15 +8810,6 @@ let
         sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
       };
     };
-    "unzip-response-2.0.1" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
-      };
-    };
     "url-parse-lax-1.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -8981,13 +8828,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "doctrine-1.4.0" = {
+    "babel-code-frame-6.16.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
+        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+      };
+    };
+    "doctrine-1.5.0" = {
       name = "doctrine";
       packageName = "doctrine";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz";
-        sha1 = "e2db32defa752407b935b381e89f3740e469e599";
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
+        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
       };
     };
     "escope-3.6.0" = {
@@ -9035,22 +8891,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.10.0" = {
+    "globals-9.12.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.10.0";
+      version = "9.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz";
-        sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7";
+        url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz";
+        sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d";
       };
     };
-    "ignore-3.1.5" = {
+    "ignore-3.2.0" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.1.5";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.1.5.tgz";
-        sha1 = "54ba1eb92ef9fff8d49e5a1fb23961cdba77eb7a";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz";
+        sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435";
       };
     };
     "inquirer-0.12.0" = {
@@ -9134,15 +8990,6 @@ let
         sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
       };
     };
-    "shelljs-0.6.1" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz";
-        sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8";
-      };
-    };
     "strip-bom-3.0.0" = {
       name = "strip-bom";
       packageName = "strip-bom";
@@ -9152,13 +8999,22 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "table-3.8.0" = {
+    "table-3.8.3" = {
       name = "table";
       packageName = "table";
-      version = "3.8.0";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz";
-        sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b";
+        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+      };
+    };
+    "js-tokens-2.0.0" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz";
+        sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5";
       };
     };
     "es6-map-0.1.4" = {
@@ -9233,15 +9089,6 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
     "flat-cache-1.2.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -9359,13 +9206,13 @@ let
         sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
-    "tryit-1.0.2" = {
+    "tryit-1.0.3" = {
       name = "tryit";
       packageName = "tryit";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tryit/-/tryit-1.0.2.tgz";
-        sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453";
+        url = "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz";
+        sha1 = "393be730a9446fd1ead6da59a014308f36c289cb";
       };
     };
     "argparse-1.0.9" = {
@@ -9458,13 +9305,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.7.5" = {
+    "ajv-4.8.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.7.5";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz";
-        sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz";
+        sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc";
       };
     };
     "ajv-keywords-1.1.1" = {
@@ -9485,6 +9332,15 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
+    "string-width-2.0.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
+        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -9494,6 +9350,15 @@ let
         sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
       };
     };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
     "glob-3.2.11" = {
       name = "glob";
       packageName = "glob";
@@ -9638,13 +9503,22 @@ let
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "chokidar-1.6.0" = {
+    "chokidar-1.6.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz";
-        sha1 = "90c32ad4802901d7713de532dc284e96a63ad058";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz";
+        sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2";
+      };
+    };
+    "minimatch-2.0.10" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
       };
     };
     "ps-tree-0.0.3" = {
@@ -9800,13 +9674,13 @@ let
         sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a";
       };
     };
-    "object.omit-2.0.0" = {
+    "object.omit-2.0.1" = {
       name = "object.omit";
       packageName = "object.omit";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz";
-        sha1 = "868597333d54e60662940bb458605dd6ae12fe94";
+        url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz";
+        sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa";
       };
     };
     "parse-glob-3.0.4" = {
@@ -9899,13 +9773,13 @@ let
         sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
       };
     };
-    "repeat-string-1.5.4" = {
+    "repeat-string-1.6.1" = {
       name = "repeat-string";
       packageName = "repeat-string";
-      version = "1.5.4";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz";
-        sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5";
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
     "is-posix-bracket-0.1.1" = {
@@ -9980,13 +9854,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.6.0" = {
+    "binary-extensions-1.7.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.6.0.tgz";
-        sha1 = "aa2184cbc434d29862c66a69bf81cc0a3383ee79";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
+        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9998,13 +9872,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.30" = {
+    "node-pre-gyp-0.6.31" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.30";
+      version = "0.6.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.30.tgz";
-        sha1 = "64d3073a6f573003717ccfe30c89023297babba1";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
     "npmlog-4.0.0" = {
@@ -10016,13 +9890,13 @@ let
         sha1 = "e094503961c70c1774eb76692080e8d578a9f88f";
       };
     };
-    "tar-pack-3.1.4" = {
+    "tar-pack-3.3.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
-      version = "3.1.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz";
-        sha1 = "bc8cf9a22f5832739f12f3910dac1eb97b49708c";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
+        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -10197,13 +10071,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.0" = {
+    "coffee-script-1.11.1" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz";
-        sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
       };
     };
     "jade-1.11.0" = {
@@ -10287,13 +10161,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.3" = {
+    "uglify-js-2.7.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.3";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
       };
     };
     "void-elements-2.0.1" = {
@@ -10323,6 +10197,15 @@ let
         sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
       };
     };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
     "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
@@ -10818,6 +10701,15 @@ let
         sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
       };
     };
+    "duplexer2-0.0.2" = {
+      name = "duplexer2";
+      packageName = "duplexer2";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
+      };
+    };
     "clone-stats-0.0.1" = {
       name = "clone-stats";
       packageName = "clone-stats";
@@ -10827,22 +10719,22 @@ let
         sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
       };
     };
-    "findup-sync-0.4.2" = {
+    "findup-sync-0.4.3" = {
       name = "findup-sync";
       packageName = "findup-sync";
-      version = "0.4.2";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz";
-        sha1 = "a8117d0f73124f5a4546839579fe52d7129fb5e5";
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz";
+        sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12";
       };
     };
-    "fined-1.0.1" = {
+    "fined-1.0.2" = {
       name = "fined";
       packageName = "fined";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.0.1.tgz";
-        sha1 = "c48af9ab5a8e0f400a0375e84154c37674dabfd4";
+        url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz";
+        sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97";
       };
     };
     "flagged-respawn-0.3.2" = {
@@ -10926,15 +10818,6 @@ let
         sha1 = "127a97f02adc41751a954d24b0de17e100e038eb";
       };
     };
-    "lodash.isarray-4.0.0" = {
-      name = "lodash.isarray";
-      packageName = "lodash.isarray";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz";
-        sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403";
-      };
-    };
     "lodash.isempty-4.4.0" = {
       name = "lodash.isempty";
       packageName = "lodash.isempty";
@@ -10962,13 +10845,13 @@ let
         sha1 = "159d6155d43904d16c10ef698911da1e91969b73";
       };
     };
-    "is-absolute-0.2.5" = {
+    "is-absolute-0.2.6" = {
       name = "is-absolute";
       packageName = "is-absolute";
-      version = "0.2.5";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.5.tgz";
-        sha1 = "994142b9f468d27c14fbf0cd30fe77db934ca76d";
+        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz";
+        sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb";
       };
     };
     "map-cache-0.2.2" = {
@@ -11088,6 +10971,15 @@ let
         sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
       };
     };
+    "glob-4.5.3" = {
+      name = "glob";
+      packageName = "glob";
+      version = "4.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+        sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
+      };
+    };
     "ordered-read-streams-0.1.0" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -11439,13 +11331,13 @@ let
         sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
       };
     };
-    "cli-1.0.0" = {
+    "cli-1.0.1" = {
       name = "cli";
       packageName = "cli";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz";
-        sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d";
+        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
+        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
     "bluebird-3.4.6" = {
@@ -11520,13 +11412,13 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.1" = {
+    "http-proxy-1.15.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.1";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz";
-        sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
+        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
       };
     };
     "isbinaryfile-3.0.1" = {
@@ -11610,13 +11502,13 @@ let
         sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
       };
     };
-    "custom-event-1.0.0" = {
+    "custom-event-1.0.1" = {
       name = "custom-event";
       packageName = "custom-event";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.0.tgz";
-        sha1 = "2e4628be19dc4b214b5c02630c5971e811618062";
+        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz";
+        sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
       };
     };
     "ent-2.2.0" = {
@@ -12492,13 +12384,13 @@ let
         sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
       };
     };
-    "vinyl-fs-2.4.3" = {
+    "vinyl-fs-2.4.4" = {
       name = "vinyl-fs";
       packageName = "vinyl-fs";
-      version = "2.4.3";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.3.tgz";
-        sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07";
+        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz";
+        sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
       };
     };
     "glob-stream-5.3.5" = {
@@ -12582,13 +12474,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.0" = {
+    "glob-parent-3.0.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz";
-        sha1 = "c7bdeb5260732196c740de9274c08814056014bb";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
+        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12618,22 +12510,31 @@ let
         sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
       };
     };
-    "is-glob-3.0.0" = {
+    "is-glob-3.1.0" = {
       name = "is-glob";
       packageName = "is-glob";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz";
-        sha1 = "e433c222db9d77844084d72db1eff047845985c1";
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
-    "is-extglob-2.0.0" = {
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
+    "is-extglob-2.1.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz";
-        sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
+        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -13248,13 +13149,22 @@ let
         sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
       };
     };
-    "cheerio-0.19.0" = {
+    "cheerio-0.22.0" = {
       name = "cheerio";
       packageName = "cheerio";
-      version = "0.19.0";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz";
-        sha1 = "772e7015f2ee29965096d71ea4175b75ab354925";
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
+        sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
+      };
+    };
+    "clone-2.0.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz";
+        sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e";
       };
     };
     "cookie-parser-1.4.3" = {
@@ -13266,22 +13176,13 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cors-2.7.1" = {
-      name = "cors";
-      packageName = "cors";
-      version = "2.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.7.1.tgz";
-        sha1 = "3c2e50a58af9ef8c89bee21226b099be1f02739b";
-      };
-    };
-    "cron-1.1.0" = {
+    "cron-1.1.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.0.tgz";
-        sha1 = "61e868c6f18f98e8bcb88bcd7ab9fb8fae909453";
+        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
+        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
       };
     };
     "follow-redirects-0.2.0" = {
@@ -13320,13 +13221,13 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.13.0" = {
+    "mqtt-1.14.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.13.0.tgz";
-        sha1 = "6060916c02efb938491b59b9e9dfec44ec8b2e87";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
+        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
       };
     };
     "mustache-2.2.1" = {
@@ -13338,13 +13239,13 @@ let
         sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
       };
     };
-    "oauth2orize-1.4.0" = {
+    "oauth2orize-1.5.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.4.0.tgz";
-        sha1 = "e9b9884b9111bff3eb3c797179e47c234d7a3df7";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
+        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13374,13 +13275,13 @@ let
         sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
       };
     };
-    "uglify-js-2.7.0" = {
+    "uglify-js-2.7.3" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.0";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz";
-        sha1 = "f021e38ba2ca740860f5bd5c695c2a817345f0ec";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
       };
     };
     "when-3.7.7" = {
@@ -13401,13 +13302,13 @@ let
         sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
       };
     };
-    "node-red-node-feedparser-0.1.5" = {
+    "node-red-node-feedparser-0.1.6" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.5";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.5.tgz";
-        sha1 = "88f2b68b3c00d2cd95498436baf9ed13b552b8d0";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz";
+        sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d";
       };
     };
     "node-red-node-email-0.1.11" = {
@@ -13437,13 +13338,13 @@ let
         sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
       };
     };
-    "node-red-node-serialport-0.2.1" = {
+    "node-red-node-serialport-0.4.0" = {
       name = "node-red-node-serialport";
       packageName = "node-red-node-serialport";
-      version = "0.2.1";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.2.1.tgz";
-        sha1 = "5f1f1d674558be9ed2b782e7c696d80f377e5701";
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz";
+        sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe";
       };
     };
     "bcrypt-0.8.7" = {
@@ -13455,31 +13356,130 @@ let
         sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
-    "css-select-1.0.0" = {
+    "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
-      version = "1.0.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz";
-        sha1 = "b1121ca51848dd264e2244d058cee254deeb44b0";
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-what-1.0.0" = {
+    "htmlparser2-3.9.2" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
+      };
+    };
+    "lodash.assignin-4.2.0" = {
+      name = "lodash.assignin";
+      packageName = "lodash.assignin";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz";
+        sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
+      };
+    };
+    "lodash.bind-4.2.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
+        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
+      };
+    };
+    "lodash.defaults-4.2.0" = {
+      name = "lodash.defaults";
+      packageName = "lodash.defaults";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+      };
+    };
+    "lodash.filter-4.6.0" = {
+      name = "lodash.filter";
+      packageName = "lodash.filter";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz";
+        sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace";
+      };
+    };
+    "lodash.flatten-4.4.0" = {
+      name = "lodash.flatten";
+      packageName = "lodash.flatten";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+      };
+    };
+    "lodash.foreach-4.5.0" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz";
+        sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
+      };
+    };
+    "lodash.map-4.6.0" = {
+      name = "lodash.map";
+      packageName = "lodash.map";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz";
+        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+      };
+    };
+    "lodash.merge-4.6.0" = {
+      name = "lodash.merge";
+      packageName = "lodash.merge";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz";
+        sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5";
+      };
+    };
+    "lodash.reduce-4.6.0" = {
+      name = "lodash.reduce";
+      packageName = "lodash.reduce";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
+        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
+      };
+    };
+    "lodash.reject-4.6.0" = {
+      name = "lodash.reject";
+      packageName = "lodash.reject";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
+        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
+      };
+    };
+    "lodash.some-4.6.0" = {
+      name = "lodash.some";
+      packageName = "lodash.some";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
+        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+      };
+    };
+    "css-what-2.1.0" = {
       name = "css-what";
       packageName = "css-what";
-      version = "1.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz";
-        sha1 = "d7cc2df45180666f99d2b14462639469e00f736c";
-      };
-    };
-    "domutils-1.4.3" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
-        sha1 = "0865513796c6b306031850e175516baf80b72a6f";
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz";
+        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
       };
     };
     "boolbase-1.0.0" = {
@@ -13500,13 +13500,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.3.1" = {
+    "moment-timezone-0.5.7" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.3.1";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.3.1.tgz";
-        sha1 = "3ef47856b02d53b718a10a5ec2023aa299e07bf5";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz";
+        sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5";
       };
     };
     "retry-0.6.1" = {
@@ -13563,13 +13563,13 @@ let
         sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
       };
     };
-    "help-me-0.1.0" = {
+    "help-me-1.0.1" = {
       name = "help-me";
       packageName = "help-me";
-      version = "0.1.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-0.1.0.tgz";
-        sha1 = "0fb3a40537ad5265b6b49413022c60d35b49539a";
+        url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz";
+        sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
     "mqtt-connection-2.1.1" = {
@@ -13626,6 +13626,15 @@ let
         sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
+    "callback-stream-1.1.0" = {
+      name = "callback-stream";
+      packageName = "callback-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
+        sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
+      };
+    };
     "reduplexer-1.1.0" = {
       name = "reduplexer";
       packageName = "reduplexer";
@@ -13689,15 +13698,6 @@ let
         sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
       };
     };
-    "request-2.65.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.65.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.65.0.tgz";
-        sha1 = "cc1a3bc72b96254734fc34296da322f9486ddeba";
-      };
-    };
     "sax-0.6.1" = {
       name = "sax";
       packageName = "sax";
@@ -13725,42 +13725,6 @@ let
         sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
       };
     };
-    "bl-1.0.3" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
-        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
-      };
-    };
-    "qs-5.2.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "5.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
-        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
-      };
-    };
-    "tough-cookie-2.2.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
-        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
-      };
-    };
-    "http-signature-0.11.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
-        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
-      };
-    };
     "nodemailer-1.11.0" = {
       name = "nodemailer";
       packageName = "nodemailer";
@@ -13950,31 +13914,22 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-2.1.2" = {
+    "serialport-4.0.3" = {
       name = "serialport";
       packageName = "serialport";
-      version = "2.1.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-2.1.2.tgz";
-        sha1 = "493af176ac59043e7da5f2d7978fa30d1a8cb353";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz";
+        sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1";
       };
     };
-    "nan-2.2.1" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.2.1";
+    "lie-3.1.0" = {
+      name = "lie";
+      packageName = "lie";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz";
-        sha1 = "d68693f6b34bb41d66bc68b3a4f9defc79d7149b";
-      };
-    };
-    "node-pre-gyp-github-1.3.1" = {
-      name = "node-pre-gyp-github";
-      packageName = "node-pre-gyp-github";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.3.1.tgz";
-        sha1 = "c6965303995b5b083eca64a1aa35fd2b511dcbb3";
+        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
+        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
       };
     };
     "object.assign-4.0.4" = {
@@ -13986,22 +13941,13 @@ let
         sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
       };
     };
-    "sf-0.1.7" = {
-      name = "sf";
-      packageName = "sf";
-      version = "0.1.7";
+    "immediate-3.0.6" = {
+      name = "immediate";
+      packageName = "immediate";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sf/-/sf-0.1.7.tgz";
-        sha1 = "806ed032d7225c7fb6394b0bdbfe1ea936fe6d74";
-      };
-    };
-    "github-0.2.4" = {
-      name = "github";
-      packageName = "github";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github/-/github-0.2.4.tgz";
-        sha1 = "24fa7f0e13fa11b946af91134c51982a91ce538b";
+        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
+        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
       };
     };
     "define-properties-1.1.2" = {
@@ -14688,6 +14634,15 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
+    "request-2.75.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.75.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+      };
+    };
     "unique-filename-1.1.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -14733,6 +14688,15 @@ let
         sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
+    "form-data-2.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+      };
+    };
     "unique-slug-2.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -14940,13 +14904,13 @@ let
         sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
       };
     };
-    "fast-diff-1.0.1" = {
+    "fast-diff-1.1.1" = {
       name = "fast-diff";
       packageName = "fast-diff";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.0.1.tgz";
-        sha1 = "76532d5b8e49f6770fd464658628f9ed47eb5ac8";
+        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz";
+        sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b";
       };
     };
     "node-alias-1.0.4" = {
@@ -14958,13 +14922,13 @@ let
         sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "npm-3.10.8" = {
+    "npm-3.10.9" = {
       name = "npm";
       packageName = "npm";
-      version = "3.10.8";
+      version = "3.10.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz";
-        sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e";
+        url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
+        sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
       };
     };
     "npmi-2.0.1" = {
@@ -14976,13 +14940,13 @@ let
         sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
       };
     };
-    "require-dir-0.3.0" = {
+    "require-dir-0.3.1" = {
       name = "require-dir";
       packageName = "require-dir";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.0.tgz";
-        sha1 = "89f074a85638b07c20a4fb94c93b5db635a64781";
+        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz";
+        sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a";
       };
     };
     "semver-utils-1.1.1" = {
@@ -14994,13 +14958,157 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "spawn-please-0.1.0" = {
+    "spawn-please-0.2.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.1.0.tgz";
-        sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac";
+        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz";
+        sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
+      };
+    };
+    "update-notifier-1.0.2" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
+        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+      };
+    };
+    "boxen-0.6.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
+        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
+      };
+    };
+    "configstore-2.1.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
+        sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
+      };
+    };
+    "latest-version-2.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
+        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+      };
+    };
+    "lazy-req-1.1.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
+        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
+      };
+    };
+    "ansi-align-1.1.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
+        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+      };
+    };
+    "cli-boxes-1.0.0" = {
+      name = "cli-boxes";
+      packageName = "cli-boxes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+      };
+    };
+    "filled-array-1.1.0" = {
+      name = "filled-array";
+      packageName = "filled-array";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
+        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+      };
+    };
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+      };
+    };
+    "dot-prop-3.0.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
+        sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
+      };
+    };
+    "is-obj-1.0.1" = {
+      name = "is-obj";
+      packageName = "is-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    };
+    "package-json-2.4.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
+        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+      };
+    };
+    "got-5.6.0" = {
+      name = "got";
+      packageName = "got";
+      version = "5.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz";
+        sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf";
+      };
+    };
+    "registry-auth-token-3.1.0" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz";
+        sha1 = "997c08256e0c7999837b90e944db39d8a790276b";
+      };
+    };
+    "node-status-codes-1.0.0" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
+        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
+      };
+    };
+    "unzip-response-1.0.1" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz";
+        sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412";
       };
     };
     "airplayer-2.0.0" = {
@@ -15012,6 +15120,33 @@ let
         sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259";
       };
     };
+    "clivas-0.2.0" = {
+      name = "clivas";
+      packageName = "clivas";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz";
+        sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
+      };
+    };
+    "inquirer-1.2.2" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz";
+        sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451";
+      };
+    };
+    "network-address-1.1.0" = {
+      name = "network-address";
+      packageName = "network-address";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
+        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
+      };
+    };
     "airplay-protocol-2.0.2" = {
       name = "airplay-protocol";
       packageName = "airplay-protocol";
@@ -15183,6 +15318,60 @@ let
         sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
       };
     };
+    "external-editor-1.1.1" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
+        sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
+      };
+    };
+    "run-async-2.2.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
+        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+      };
+    };
+    "rx-4.1.0" = {
+      name = "rx";
+      packageName = "rx";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+      };
+    };
+    "spawn-sync-1.0.15" = {
+      name = "spawn-sync";
+      packageName = "spawn-sync";
+      version = "1.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz";
+        sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
+      };
+    };
+    "tmp-0.0.29" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz";
+        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
+      };
+    };
+    "os-shim-0.1.3" = {
+      name = "os-shim";
+      packageName = "os-shim";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz";
+        sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917";
+      };
+    };
     "connect-multiparty-1.2.5" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
@@ -15651,15 +15840,6 @@ let
         sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d";
       };
     };
-    "network-address-1.1.0" = {
-      name = "network-address";
-      packageName = "network-address";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
-        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
-      };
-    };
     "simple-get-1.4.3" = {
       name = "simple-get";
       packageName = "simple-get";
@@ -15813,6 +15993,33 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
+    "bl-1.0.3" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
+        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
+      };
+    };
+    "qs-5.2.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
+        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
+      };
+    };
+    "tough-cookie-2.2.2" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
+        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
+      };
+    };
     "throttleit-1.0.0" = {
       name = "throttleit";
       packageName = "throttleit";
@@ -16183,13 +16390,13 @@ let
         sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
       };
     };
-    "bunyan-1.8.1" = {
+    "bunyan-1.8.4" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.1";
+      version = "1.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz";
-        sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz";
+        sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73";
       };
     };
     "handlebars-2.0.0" = {
@@ -16210,13 +16417,13 @@ let
         sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
       };
     };
-    "lunr-0.7.1" = {
+    "lunr-0.7.2" = {
       name = "lunr";
       packageName = "lunr";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.1.tgz";
-        sha1 = "b5a2cff99555b7893f5f1a4a17af3f638373c4bb";
+        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
+        sha1 = "79a30e932e216cba163541ee37a3607c12cd7281";
       };
     };
     "render-readme-1.3.1" = {
@@ -16336,13 +16543,13 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "dtrace-provider-0.6.0" = {
+    "dtrace-provider-0.7.1" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.6.0";
+      version = "0.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
-        sha1 = "0b078d5517937d873101452d9146737557b75e51";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz";
+        sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04";
       };
     };
     "mv-2.1.1" = {
@@ -16435,15 +16642,6 @@ let
         sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
       };
     };
-    "htmlparser2-3.9.1" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz";
-        sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2";
-      };
-    };
     "regexp-quote-0.0.0" = {
       name = "regexp-quote";
       packageName = "regexp-quote";
@@ -16561,6 +16759,15 @@ let
         sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
+    "http-signature-0.11.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+      };
+    };
     "keep-alive-agent-0.0.1" = {
       name = "keep-alive-agent";
       packageName = "keep-alive-agent";
@@ -16597,6 +16804,15 @@ let
         sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94";
       };
     };
+    "dtrace-provider-0.6.0" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
+        sha1 = "0b078d5517937d873101452d9146737557b75e51";
+      };
+    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -17380,13 +17596,13 @@ let
         sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
       };
     };
-    "editions-1.1.2" = {
+    "editions-1.3.1" = {
       name = "editions";
       packageName = "editions";
-      version = "1.1.2";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-1.1.2.tgz";
-        sha1 = "8cdf0cb39eafc564149181ca37c8272e98b16eab";
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz";
+        sha1 = "008425f64dc1401db45ec110e06aa602562419c0";
       };
     };
     "typechecker-4.3.0" = {
@@ -17668,15 +17884,6 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.29" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.29";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz";
-        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
-      };
-    };
     "follow-redirects-0.0.3" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -17740,15 +17947,6 @@ let
         sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
       };
     };
-    "uglify-js-2.6.4" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.4.tgz";
-        sha1 = "65ea2fb3059c9394692f15fed87c2b36c16b9adf";
-      };
-    };
     "watchpack-0.2.9" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -17785,13 +17983,13 @@ let
         sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978";
       };
     };
-    "emojis-list-2.0.1" = {
+    "emojis-list-2.1.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.0.1.tgz";
-        sha1 = "a174d9d0838eb36af3d0590bb6d3e8dcd94f4fbd";
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
     "json5-0.5.0" = {
@@ -17812,6 +18010,15 @@ let
         sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
+    "constants-browserify-0.0.1" = {
+      name = "constants-browserify";
+      packageName = "constants-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+      };
+    };
     "crypto-browserify-3.2.8" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
@@ -17821,6 +18028,15 @@ let
         sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
       };
     };
+    "http-browserify-1.7.0" = {
+      name = "http-browserify";
+      packageName = "http-browserify";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+      };
+    };
     "https-browserify-0.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
@@ -17830,6 +18046,24 @@ let
         sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
       };
     };
+    "stream-browserify-1.0.0" = {
+      name = "stream-browserify";
+      packageName = "stream-browserify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
+      };
+    };
+    "url-0.10.3" = {
+      name = "url";
+      packageName = "url";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
+        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
+      };
+    };
     "pbkdf2-compat-2.0.1" = {
       name = "pbkdf2-compat";
       packageName = "pbkdf2-compat";
@@ -17857,6 +18091,15 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
+    "Base64-0.2.1" = {
+      name = "Base64";
+      packageName = "Base64";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+      };
+    };
     "source-list-map-0.1.6" = {
       name = "source-list-map";
       packageName = "source-list-map";
@@ -17872,10 +18115,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.2";
+    version = "1.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz";
-      sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
+      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -17941,10 +18184,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.5";
+    version = "0.10.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz";
-      sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz";
+      sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -17972,14 +18215,14 @@ in
       sources."azure-arm-powerbiembedded-0.1.0"
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
-      sources."azure-arm-website-0.11.0"
+      sources."azure-arm-website-0.11.4"
       sources."azure-arm-rediscache-0.2.1"
       sources."azure-arm-datalake-analytics-0.4.3"
       sources."azure-arm-datalake-store-0.4.2"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
-      sources."azure-keyvault-0.10.2"
+      sources."azure-keyvault-0.11.0"
       sources."azure-asm-compute-0.17.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-trafficmanager-0.10.3"
@@ -18010,7 +18253,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."azure-arm-batch-0.2.0"
+      sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
       sources."applicationinsights-0.15.12"
@@ -18026,15 +18269,15 @@ in
       sources."jsonlint-1.6.2"
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
-      (sources."kuduscript-1.0.8" // {
+      (sources."kuduscript-1.0.9" // {
         dependencies = [
           sources."commander-1.1.1"
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.15.1"
-      sources."ms-rest-1.15.0"
-      (sources."ms-rest-azure-1.15.0" // {
+      sources."moment-2.15.2"
+      sources."ms-rest-1.15.2"
+      (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
           sources."async-0.2.7"
           sources."azure-arm-resource-1.4.4-preview"
@@ -18116,7 +18359,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."buffer-equal-constant-time-1.0.1"
       sources."ecdsa-sig-formatter-1.0.7"
-      sources."base64-url-1.3.2"
+      sources."base64-url-1.3.3"
       sources."dateformat-1.0.2-1.2.3"
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
@@ -18163,9 +18406,9 @@ in
       })
       sources."ncp-0.4.2"
       sources."rimraf-2.5.4"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -18176,7 +18419,7 @@ in
       sources."cycle-1.0.3"
       sources."isstream-0.1.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -18188,7 +18431,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.0.1"
+          sources."async-2.1.2"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -18207,11 +18450,11 @@ in
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.16.2"
-      sources."is-my-json-valid-2.14.0"
+      sources."lodash-4.16.4"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -18220,7 +18463,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -18255,9 +18498,10 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
-      sources."fibers-1.0.14"
+      sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.0"
       sources."http-response-object-1.1.0"
@@ -18334,7 +18578,7 @@ in
       })
       sources."sort-keys-length-1.0.1"
       sources."got-2.9.2"
-      sources."duplexify-3.4.5"
+      sources."duplexify-3.5.0"
       sources."infinity-agent-2.0.3"
       sources."is-stream-1.1.0"
       sources."lowercase-keys-1.0.0"
@@ -18374,7 +18618,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -18411,15 +18655,19 @@ in
           sources."graceful-fs-4.1.9"
         ];
       })
-      sources."klaw-1.3.0"
+      (sources."klaw-1.3.1" // {
+        dependencies = [
+          sources."graceful-fs-4.1.9"
+        ];
+      })
       sources."path-is-absolute-1.0.1"
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          sources."glob-7.1.0"
+          sources."glob-7.1.1"
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -18445,10 +18693,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.0";
+    version = "13.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
-      sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
+      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
     };
     dependencies = [
       sources."JSONStream-1.2.1"
@@ -18457,6 +18705,7 @@ in
       sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
+      sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -18481,7 +18730,7 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."module-deps-4.0.7"
+      sources."module-deps-4.0.8"
       sources."os-browserify-0.1.2"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
@@ -18494,7 +18743,7 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.4.0"
+      sources."stream-http-2.4.1"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -18531,7 +18780,7 @@ in
       sources."source-map-0.5.6"
       sources."pako-0.2.9"
       sources."base64-js-1.2.0"
-      sources."ieee754-1.1.6"
+      sources."ieee754-1.1.8"
       sources."isarray-1.0.0"
       sources."typedarray-0.0.6"
       sources."core-util-is-1.0.2"
@@ -18544,7 +18793,7 @@ in
       sources."create-hash-1.1.2"
       sources."create-hmac-1.1.4"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.8"
+      sources."pbkdf2-3.0.9"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.3"
       sources."browserify-aes-1.0.6"
@@ -18564,7 +18813,7 @@ in
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.5"
       sources."miller-rabin-4.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -18578,7 +18827,11 @@ in
       sources."astw-2.0.0"
       sources."acorn-1.2.2"
       sources."stream-splicer-2.0.0"
-      sources."detective-4.3.1"
+      (sources."detective-4.3.2" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."buffer-shims-1.0.0"
@@ -18654,7 +18907,7 @@ in
       (sources."xml2js-0.4.17" // {
         dependencies = [
           sources."xmlbuilder-4.2.1"
-          sources."lodash-4.16.2"
+          sources."lodash-4.16.4"
         ];
       })
       sources."xtend-4.0.1"
@@ -18708,7 +18961,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -18793,14 +19046,15 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.4"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.2.3"
+      sources."simple-get-2.3.0"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-0.10.0"
       sources."simple-sha1-2.0.8"
       sources."rusha-0.8.4"
       sources."once-1.4.0"
-      sources."unzip-response-1.0.1"
+      sources."simple-concat-1.0.0"
+      sources."unzip-response-2.0.1"
       sources."wrappy-1.0.2"
       (sources."end-of-stream-1.0.0" // {
         dependencies = [
@@ -18852,9 +19106,9 @@ in
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
       sources."cyclist-0.1.1"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.6"
@@ -18961,10 +19215,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.0";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz";
-      sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -18977,47 +19231,79 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "6.3.1";
+    version = "6.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-6.3.1.tgz";
-      sha1 = "0513fa5c0aee5be63c853b214cfb83382a2f8c61";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz";
+      sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776";
     };
     dependencies = [
-      (sources."cordova-lib-6.3.1" // {
+      (sources."cordova-common-1.5.1" // {
         dependencies = [
-          sources."nopt-3.0.6"
-        ];
-      })
-      (sources."cordova-common-1.4.1" // {
-        dependencies = [
-          sources."bplist-parser-0.1.1"
           sources."q-1.4.1"
-          sources."semver-5.3.0"
-          sources."shelljs-0.5.3"
           sources."underscore-1.8.3"
         ];
       })
-      sources."q-1.0.1"
-      sources."nopt-3.0.1"
-      sources."underscore-1.7.0"
-      sources."update-notifier-0.5.0"
+      (sources."cordova-lib-6.4.0" // {
+        dependencies = [
+          sources."nopt-3.0.6"
+          sources."semver-4.3.6"
+          sources."shelljs-0.3.0"
+          sources."unorm-1.3.3"
+        ];
+      })
       (sources."insight-0.8.3" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."request-2.75.0"
+          sources."request-2.76.0"
+          sources."qs-6.3.0"
         ];
       })
+      sources."nopt-3.0.1"
+      sources."q-1.0.1"
+      sources."underscore-1.7.0"
+      sources."update-notifier-0.5.0"
+      sources."ansi-0.3.1"
+      sources."bplist-parser-0.1.1"
+      sources."cordova-registry-mapper-1.1.15"
+      sources."elementtree-0.1.6"
+      sources."glob-5.0.15"
+      sources."minimatch-3.0.3"
+      sources."osenv-0.1.3"
+      sources."plist-1.2.0"
+      sources."semver-5.3.0"
+      sources."shelljs-0.5.3"
+      sources."unorm-1.4.1"
+      sources."big-integer-1.6.16"
+      sources."sax-0.3.5"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."base64-js-0.0.8"
+      sources."xmlbuilder-4.0.0"
+      sources."xmldom-0.1.22"
+      sources."util-deprecate-1.0.2"
+      sources."lodash-3.10.1"
       sources."aliasify-1.9.0"
-      sources."cordova-app-hello-world-3.10.0"
       (sources."cordova-fetch-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
-          sources."shelljs-0.7.4"
-          sources."glob-7.1.0"
+          sources."shelljs-0.7.5"
+          sources."glob-7.1.1"
         ];
       })
-      sources."cordova-js-4.1.4"
-      sources."cordova-registry-mapper-1.1.15"
+      (sources."cordova-create-1.0.1" // {
+        dependencies = [
+          sources."shelljs-0.3.0"
+        ];
+      })
+      sources."cordova-js-4.2.0"
       (sources."cordova-serve-1.0.0" // {
         dependencies = [
           sources."q-1.4.1"
@@ -19028,8 +19314,6 @@ in
           sources."underscore-1.2.1"
         ];
       })
-      sources."elementtree-0.1.6"
-      sources."glob-5.0.15"
       (sources."init-package-json-1.9.4" // {
         dependencies = [
           sources."glob-6.0.4"
@@ -19040,16 +19324,13 @@ in
           sources."glob-7.0.6"
           sources."nopt-3.0.6"
           sources."npm-package-arg-4.1.1"
-          sources."readable-stream-2.1.5"
           sources."request-2.74.0"
           sources."semver-5.1.1"
           sources."tar-2.2.1"
-          sources."isarray-1.0.0"
           sources."form-data-1.0.1"
         ];
       })
       sources."opener-1.4.1"
-      sources."plist-1.2.0"
       sources."properties-parser-0.2.3"
       (sources."request-2.47.0" // {
         dependencies = [
@@ -19076,10 +19357,7 @@ in
           sources."delayed-stream-0.0.5"
         ];
       })
-      sources."semver-4.3.6"
-      sources."shelljs-0.3.0"
       sources."tar-1.0.2"
-      sources."unorm-1.3.3"
       sources."valid-identifier-0.0.1"
       sources."xcode-0.8.9"
       sources."browserify-transform-tools-1.5.3"
@@ -19098,76 +19376,56 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
-      sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
       sources."resolve-1.1.7"
-      (sources."browserify-10.1.3" // {
-        dependencies = [
-          sources."glob-4.5.3"
-          sources."minimatch-2.0.10"
-        ];
-      })
+      sources."cordova-app-hello-world-3.11.0"
+      sources."browserify-13.1.0"
       sources."JSONStream-1.2.1"
       sources."assert-1.3.0"
-      (sources."browser-pack-4.0.4" // {
-        dependencies = [
-          sources."through2-0.5.1"
-          sources."readable-stream-1.0.34"
-          sources."xtend-3.0.0"
-        ];
-      })
+      sources."browser-pack-6.0.1"
       sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
-      (sources."buffer-3.6.0" // {
+      (sources."buffer-4.9.1" // {
         dependencies = [
+          sources."base64-js-1.2.0"
           sources."isarray-1.0.0"
         ];
       })
-      sources."builtins-0.0.7"
-      sources."commondir-0.0.1"
-      sources."concat-stream-1.4.10"
-      sources."console-browserify-1.1.0"
-      sources."constants-browserify-0.0.1"
-      sources."crypto-browserify-3.11.0"
-      sources."deep-equal-1.0.1"
-      sources."defined-1.0.0"
-      sources."deps-sort-1.3.9"
-      sources."domain-browser-1.1.7"
-      sources."duplexer2-0.0.2"
-      sources."events-1.0.2"
-      sources."has-1.0.1"
-      sources."htmlescape-1.1.1"
-      sources."http-browserify-1.7.0"
-      sources."https-browserify-0.0.1"
-      (sources."insert-module-globals-6.6.3" // {
+      (sources."concat-stream-1.5.2" // {
         dependencies = [
-          sources."combine-source-map-0.6.1"
-          sources."convert-source-map-1.1.3"
-          sources."inline-source-map-0.5.0"
-          sources."source-map-0.4.4"
+          sources."readable-stream-2.0.6"
+          sources."isarray-1.0.0"
         ];
       })
-      sources."labeled-stream-splicer-1.0.2"
-      sources."module-deps-3.9.1"
+      sources."console-browserify-1.1.0"
+      sources."constants-browserify-1.0.0"
+      sources."crypto-browserify-3.11.0"
+      sources."defined-1.0.0"
+      sources."deps-sort-2.0.0"
+      sources."domain-browser-1.1.7"
+      sources."duplexer2-0.1.4"
+      sources."events-1.1.1"
+      sources."has-1.0.1"
+      sources."htmlescape-1.1.1"
+      sources."https-browserify-0.0.1"
+      sources."insert-module-globals-7.0.1"
+      sources."labeled-stream-splicer-2.0.0"
+      sources."module-deps-4.0.8"
       sources."os-browserify-0.1.2"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.9"
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
-      sources."read-only-stream-1.1.1"
-      sources."readable-stream-1.1.14"
-      sources."shallow-copy-0.0.1"
+      sources."read-only-stream-2.0.0"
+      (sources."readable-stream-2.1.5" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+        ];
+      })
       sources."shasum-1.0.2"
-      sources."shell-quote-0.0.1"
-      sources."stream-browserify-1.0.0"
+      sources."shell-quote-1.6.1"
+      sources."stream-browserify-2.0.1"
+      sources."stream-http-2.4.1"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -19175,10 +19433,15 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      sources."through2-1.1.1"
+      (sources."through2-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+          sources."isarray-1.0.0"
+        ];
+      })
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.10.3" // {
+      (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
@@ -19191,21 +19454,17 @@ in
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
       sources."jsonparse-1.2.0"
-      sources."combine-source-map-0.3.0"
+      sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
-      (sources."inline-source-map-0.3.1" // {
-        dependencies = [
-          sources."source-map-0.3.0"
-        ];
-      })
-      sources."convert-source-map-0.3.5"
-      sources."source-map-0.1.43"
-      sources."amdefine-1.0.0"
-      sources."core-util-is-1.0.2"
+      sources."convert-source-map-1.1.3"
+      sources."inline-source-map-0.6.2"
+      sources."lodash.memoize-3.0.4"
+      sources."source-map-0.5.6"
       sources."pako-0.2.9"
-      sources."base64-js-0.0.8"
-      sources."ieee754-1.1.6"
+      sources."ieee754-1.1.8"
       sources."typedarray-0.0.6"
+      sources."core-util-is-1.0.2"
+      sources."process-nextick-args-1.0.7"
       sources."date-now-0.1.4"
       sources."browserify-cipher-1.0.0"
       sources."browserify-sign-4.0.0"
@@ -19213,7 +19472,7 @@ in
       sources."create-hash-1.1.2"
       sources."create-hmac-1.1.4"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.8"
+      sources."pbkdf2-3.0.9"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.3"
       sources."browserify-aes-1.0.6"
@@ -19234,27 +19493,29 @@ in
       sources."sha.js-2.4.5"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
-      sources."Base64-0.2.1"
       sources."is-buffer-1.1.4"
       sources."lexical-scope-1.2.0"
-      sources."lodash.memoize-3.0.4"
       sources."astw-2.0.0"
-      sources."stream-splicer-1.3.2"
-      sources."readable-wrap-1.0.0"
-      sources."indexof-0.0.1"
-      sources."detective-4.3.1"
-      (sources."stream-combiner2-1.0.2" // {
+      sources."stream-splicer-2.0.0"
+      sources."cached-path-relative-1.0.0"
+      (sources."detective-4.3.2" // {
         dependencies = [
-          sources."through2-0.5.1"
-          sources."readable-stream-1.0.34"
-          sources."xtend-3.0.0"
+          sources."acorn-3.3.0"
         ];
       })
+      sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
+      sources."buffer-shims-1.0.0"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
+      sources."array-filter-0.0.1"
+      sources."array-reduce-0.0.0"
+      sources."array-map-0.0.0"
+      sources."builtin-status-codes-2.0.0"
+      sources."to-arraybuffer-1.0.1"
       sources."minimist-1.2.0"
       sources."querystring-0.2.0"
+      sources."indexof-0.0.1"
       sources."chalk-1.1.3"
       sources."compression-1.6.2"
       sources."express-4.14.0"
@@ -19311,12 +19572,7 @@ in
       sources."mime-1.3.4"
       sources."setprototypeof-1.0.1"
       sources."media-typer-0.3.0"
-      sources."sax-0.3.5"
-      (sources."npm-package-arg-4.2.0" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
+      sources."npm-package-arg-4.2.0"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
       (sources."read-package-json-2.0.4" // {
@@ -19335,10 +19591,10 @@ in
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
+      sources."builtins-0.0.7"
       sources."abbrev-1.0.9"
-      sources."ansi-0.3.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."archy-1.0.0"
@@ -19349,7 +19605,7 @@ in
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
-      sources."config-chain-1.1.10"
+      sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.9"
@@ -19368,7 +19624,7 @@ in
       })
       (sources."node-gyp-3.4.0" // {
         dependencies = [
-          sources."glob-7.1.0"
+          sources."glob-7.1.1"
           sources."tar-2.2.1"
         ];
       })
@@ -19377,30 +19633,22 @@ in
       sources."npm-install-checks-1.0.7"
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
-          sources."concat-stream-1.5.2"
-          sources."request-2.75.0"
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
+          sources."request-2.76.0"
+          sources."qs-6.3.0"
         ];
       })
       sources."npm-user-validate-0.1.5"
       sources."npmlog-2.0.4"
-      sources."osenv-0.1.3"
       sources."path-is-inside-1.0.2"
       sources."read-installed-4.0.3"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.0"
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          sources."glob-7.1.0"
-        ];
-      })
-      (sources."sha-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.1.5"
-          sources."isarray-1.0.0"
+          sources."glob-7.1.1"
         ];
       })
+      sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
       sources."text-table-0.2.0"
@@ -19424,21 +19672,13 @@ in
       sources."d-0.1.1"
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -19448,17 +19688,17 @@ in
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -19498,85 +19738,37 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
       sources."debuglog-1.0.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."util-extend-1.0.3"
-      sources."buffer-shims-1.0.0"
-      sources."async-2.0.1"
-      sources."lodash-4.16.2"
-      sources."isexe-1.1.2"
-      (sources."xmlbuilder-4.0.0" // {
+      (sources."bl-1.1.2" // {
         dependencies = [
-          sources."lodash-3.10.1"
+          sources."readable-stream-2.0.6"
+          sources."isarray-1.0.0"
         ];
       })
-      sources."xmldom-0.1.22"
+      (sources."async-2.1.2" // {
+        dependencies = [
+          sources."lodash-4.16.4"
+        ];
+      })
+      sources."isexe-1.1.2"
       sources."ctype-0.5.3"
       sources."pegjs-0.9.0"
-      sources."simple-plist-0.1.4"
-      sources."bplist-parser-0.0.6"
+      (sources."simple-plist-0.1.4" // {
+        dependencies = [
+          sources."bplist-parser-0.0.6"
+        ];
+      })
       sources."bplist-creator-0.0.4"
       sources."stream-buffers-0.2.6"
-      sources."big-integer-1.6.16"
       sources."configstore-1.4.0"
-      sources."is-npm-1.0.0"
-      sources."latest-version-1.0.1"
-      sources."repeating-1.1.3"
-      (sources."semver-diff-2.1.0" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
-      sources."string-length-1.0.1"
+      sources."inquirer-0.10.1"
+      sources."lodash.debounce-3.1.1"
       sources."object-assign-4.1.0"
+      sources."os-name-1.0.3"
       sources."uuid-2.0.3"
       sources."xdg-basedir-2.0.0"
-      sources."package-json-1.2.0"
-      (sources."got-3.3.1" // {
-        dependencies = [
-          sources."object-assign-3.0.0"
-        ];
-      })
-      sources."registry-url-3.1.0"
-      (sources."duplexify-3.4.5" // {
-        dependencies = [
-          sources."readable-stream-2.1.5"
-          sources."isarray-1.0.0"
-        ];
-      })
-      sources."infinity-agent-2.0.3"
-      sources."is-redirect-1.0.0"
-      sources."is-stream-1.1.0"
-      sources."lowercase-keys-1.0.0"
-      sources."nested-error-stacks-1.0.2"
-      sources."prepend-http-1.0.4"
-      (sources."read-all-stream-3.1.0" // {
-        dependencies = [
-          sources."readable-stream-2.1.5"
-          sources."isarray-1.0.0"
-        ];
-      })
-      sources."timed-out-2.0.0"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
-      sources."stream-shift-1.0.0"
-      sources."rc-1.1.6"
-      sources."deep-extend-0.4.1"
-      sources."strip-json-comments-1.0.4"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
-      (sources."inquirer-0.10.1" // {
-        dependencies = [
-          sources."lodash-3.10.1"
-        ];
-      })
-      sources."lodash.debounce-3.1.1"
-      sources."os-name-1.0.3"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-1.1.1"
@@ -19593,13 +19785,41 @@ in
       sources."onetime-1.1.0"
       sources."code-point-at-1.0.1"
       sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
       sources."lodash._getnative-3.9.1"
       sources."osx-release-1.1.0"
-      (sources."win-release-1.1.1" // {
+      sources."win-release-1.1.1"
+      sources."is-npm-1.0.0"
+      sources."latest-version-1.0.1"
+      sources."repeating-1.1.3"
+      sources."semver-diff-2.1.0"
+      sources."string-length-1.0.1"
+      sources."package-json-1.2.0"
+      (sources."got-3.3.1" // {
         dependencies = [
-          sources."semver-5.3.0"
+          sources."object-assign-3.0.0"
         ];
       })
+      sources."registry-url-3.1.0"
+      sources."duplexify-3.5.0"
+      sources."infinity-agent-2.0.3"
+      sources."is-redirect-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."nested-error-stacks-1.0.2"
+      sources."prepend-http-1.0.4"
+      sources."read-all-stream-3.1.0"
+      sources."timed-out-2.0.0"
+      (sources."end-of-stream-1.0.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."stream-shift-1.0.0"
+      sources."rc-1.1.6"
+      sources."deep-extend-0.4.1"
+      sources."strip-json-comments-1.0.4"
+      sources."is-finite-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -19611,10 +19831,10 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz";
-      sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
+      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
     };
     dependencies = [
       sources."clone-1.0.2"
@@ -19786,7 +20006,7 @@ in
       sources."from2-1.3.0"
       sources."fs-blob-store-5.2.1"
       sources."level-0.18.0"
-      (sources."level-sublevel-6.6.0" // {
+      (sources."level-sublevel-6.6.1" // {
         dependencies = [
           (sources."levelup-0.19.1" // {
             dependencies = [
@@ -19856,7 +20076,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
-      (sources."duplexify-3.4.5" // {
+      (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
           sources."readable-stream-2.1.5"
@@ -19869,11 +20089,14 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."level-packager-0.18.0"
-      sources."pull-stream-2.21.0"
-      sources."ltgt-2.1.2"
       sources."bytewise-1.1.0"
+      sources."ltgt-2.1.2"
+      sources."pull-level-2.0.3"
+      sources."pull-stream-3.4.5"
       sources."typewiselite-1.0.0"
-      sources."pull-core-1.0.0"
+      sources."bytewise-core-1.2.3"
+      sources."typewise-1.0.3"
+      sources."typewise-core-1.2.0"
       (sources."bl-0.8.2" // {
         dependencies = [
           sources."readable-stream-1.0.34"
@@ -19888,9 +20111,17 @@ in
           sources."xtend-3.0.0"
         ];
       })
-      sources."bytewise-core-1.2.3"
-      sources."typewise-1.0.3"
-      sources."typewise-core-1.2.0"
+      sources."level-post-1.0.5"
+      sources."pull-cat-1.1.11"
+      sources."pull-live-1.0.1"
+      sources."pull-pushable-2.0.1"
+      sources."pull-window-2.1.4"
+      (sources."stream-to-pull-stream-1.7.2" // {
+        dependencies = [
+          sources."looper-3.0.0"
+        ];
+      })
+      sources."looper-2.0.0"
       sources."bindings-1.2.1"
       sources."nan-2.1.0"
       sources."murl-0.4.1"
@@ -19916,21 +20147,20 @@ in
     dependencies = [
       sources."JSONStream-1.1.4"
       sources."async-2.0.1"
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       sources."optimist-0.6.1"
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."jsonparse-1.2.0"
       sources."through-2.3.8"
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.4"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
-      sources."bl-1.1.2"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -19940,22 +20170,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."readable-stream-2.0.6"
-      sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -19966,7 +20189,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20001,6 +20224,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20071,7 +20295,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -20103,32 +20327,33 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.7.0";
+    version = "3.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz";
-      sha1 = "27499b403de70f8832815c3550330bad67292a57";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz";
+      sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e";
     };
     dependencies = [
+      sources."babel-code-frame-6.16.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.5.2"
       sources."debug-2.2.0"
-      sources."doctrine-1.4.0"
+      sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.3.2"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
-      sources."glob-7.1.0"
-      sources."globals-9.10.0"
-      sources."ignore-3.1.5"
+      sources."glob-7.1.1"
+      sources."globals-9.12.0"
+      sources."ignore-3.2.0"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.6.1"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
@@ -20136,12 +20361,18 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.2"
-      sources."shelljs-0.6.1"
+      sources."shelljs-0.7.5"
       sources."strip-bom-3.0.0"
       sources."strip-json-comments-1.0.4"
-      sources."table-3.8.0"
+      (sources."table-3.8.3" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
       sources."text-table-0.2.0"
       sources."user-home-2.0.0"
+      sources."js-tokens-2.0.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -20194,7 +20425,7 @@ in
       sources."is-path-inside-1.0.0"
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -20220,10 +20451,10 @@ in
       sources."number-is-nan-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
-      sources."tryit-1.0.2"
+      sources."tryit-1.0.3"
       sources."argparse-1.0.9"
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
@@ -20237,7 +20468,10 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-4.7.5"
+      sources."interpret-1.0.1"
+      sources."rechoir-0.6.2"
+      sources."resolve-1.1.7"
+      sources."ajv-4.8.2"
       sources."ajv-keywords-1.1.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -20356,7 +20590,7 @@ in
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."mute-stream-0.0.6"
-      sources."chokidar-1.6.0"
+      sources."chokidar-1.6.1"
       sources."minimatch-2.0.10"
       sources."ps-tree-0.0.3"
       sources."anymatch-1.3.0"
@@ -20382,7 +20616,7 @@ in
       sources."is-extglob-1.0.0"
       sources."kind-of-3.0.4"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
       sources."arr-flatten-1.0.1"
@@ -20393,7 +20627,7 @@ in
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
       sources."randomatic-1.1.5"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -20404,7 +20638,7 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.6.0"
+      sources."binary-extensions-1.7.0"
       sources."graceful-fs-4.1.9"
       sources."readable-stream-2.1.5"
       sources."set-immediate-shim-1.0.1"
@@ -20417,7 +20651,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.30"
+      sources."node-pre-gyp-0.6.31"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -20430,11 +20664,11 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
@@ -20464,17 +20698,12 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -20484,15 +20713,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -20501,7 +20730,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20536,13 +20765,14 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      (sources."glob-7.1.0" // {
+      sources."punycode-1.4.1"
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."minimatch-3.0.3"
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
@@ -20582,10 +20812,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.1";
+    version = "0.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.1.tgz";
-      sha1 = "7d9cb28a9e8e1076d005b94baa6ec5c6316fe1e9";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
+      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
     };
     dependencies = [
       sources."minilog-2.0.8"
@@ -20596,7 +20826,7 @@ in
     meta = {
       description = "A tool for managing multiple git repositories";
       homepage = "https://github.com/mixu/gr#readme";
-      license = "BSD";
+      license = "BSD-3-Clause";
     };
     production = true;
   };
@@ -20614,7 +20844,7 @@ in
       sources."nopt-3.0.6"
       sources."resolve-1.1.7"
       sources."glob-5.0.15"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -20643,7 +20873,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.0"
+      sources."coffee-script-1.11.1"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -20670,7 +20900,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.7.3" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -20711,14 +20941,14 @@ in
       sources."lazy-cache-1.0.4"
       sources."kind-of-3.0.4"
       sources."longest-1.0.1"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.4"
       sources."nan-2.4.0"
     ];
     buildInputs = globalBuildInputs;
@@ -20809,7 +21039,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -20857,12 +21087,8 @@ in
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."extend-3.0.0"
-      sources."findup-sync-0.4.2"
-      (sources."fined-1.0.1" // {
-        dependencies = [
-          sources."lodash.isarray-4.0.0"
-        ];
-      })
+      sources."findup-sync-0.4.3"
+      sources."fined-1.0.2"
       sources."flagged-respawn-0.3.2"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.isstring-4.0.1"
@@ -20883,7 +21109,7 @@ in
       sources."filename-regex-2.0.0"
       sources."kind-of-3.0.4"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
       sources."arr-flatten-1.0.1"
@@ -20898,7 +21124,7 @@ in
         ];
       })
       sources."randomatic-1.1.5"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
       sources."for-own-0.1.4"
@@ -20923,11 +21149,7 @@ in
       sources."lodash.isempty-4.4.0"
       sources."lodash.pick-4.4.0"
       sources."parse-filepath-1.0.1"
-      (sources."is-absolute-0.2.5" // {
-        dependencies = [
-          sources."is-windows-0.1.1"
-        ];
-      })
+      sources."is-absolute-0.2.6"
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
       sources."is-relative-0.2.1"
@@ -20958,7 +21180,7 @@ in
       sources."ordered-read-streams-0.1.0"
       sources."glob2base-0.0.12"
       sources."unique-stream-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -21032,7 +21254,7 @@ in
       sources."strip-json-comments-1.0.4"
       sources."xml-1.0.0"
       sources."parserlib-0.2.5"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -21124,7 +21346,7 @@ in
       sources."levn-0.3.0"
       sources."fast-levenshtein-2.0.5"
       sources."amdefine-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
@@ -21137,7 +21359,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.7.3" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -21160,7 +21382,7 @@ in
       sources."lazy-cache-1.0.4"
       sources."kind-of-3.0.4"
       sources."longest-1.0.1"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
       sources."argparse-1.0.9"
       sources."sprintf-js-1.0.3"
@@ -21197,13 +21419,13 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.9.3";
+    version = "2.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.3.tgz";
-      sha1 = "a2e14ff85c2d6bf8c8080e5aa55129ebc6a2d320";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
+      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
     };
     dependencies = [
-      sources."cli-1.0.0"
+      sources."cli-1.0.1"
       sources."console-browserify-1.1.0"
       sources."exit-0.1.2"
       sources."htmlparser2-3.8.3"
@@ -21211,9 +21433,9 @@ in
       sources."shelljs-0.3.0"
       sources."strip-json-comments-1.0.4"
       sources."lodash-3.7.0"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -21307,11 +21529,11 @@ in
     dependencies = [
       sources."bluebird-3.4.6"
       sources."body-parser-1.15.2"
-      sources."chokidar-1.6.0"
+      sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.16.2"
+          sources."lodash-4.16.4"
         ];
       })
       sources."connect-3.5.0"
@@ -21326,9 +21548,9 @@ in
           sources."repeat-string-0.2.2"
         ];
       })
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."graceful-fs-4.1.9"
-      sources."http-proxy-1.15.1"
+      sources."http-proxy-1.15.2"
       sources."isbinaryfile-3.0.1"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
@@ -21386,7 +21608,7 @@ in
       sources."is-extglob-1.0.0"
       sources."kind-of-3.0.4"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
       sources."arr-flatten-1.0.1"
@@ -21397,7 +21619,7 @@ in
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
       sources."randomatic-1.1.5"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -21408,7 +21630,7 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.6.0"
+      sources."binary-extensions-1.7.0"
       sources."readable-stream-2.1.5"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -21417,7 +21639,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.30"
+      sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.0"
@@ -21426,10 +21648,14 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.75.0"
+      (sources."request-2.76.0" // {
+        dependencies = [
+          sources."qs-6.3.0"
+        ];
+      })
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      sources."tar-pack-3.1.4"
+      sources."tar-pack-3.3.0"
       sources."minimist-0.0.8"
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
@@ -21453,17 +21679,12 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -21473,13 +21694,13 @@ in
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -21488,7 +21709,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -21522,6 +21743,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
       sources."fstream-ignore-1.0.5"
@@ -21532,12 +21754,12 @@ in
       sources."parseurl-1.3.1"
       sources."utils-merge-1.0.0"
       sources."escape-html-1.0.3"
-      sources."custom-event-1.0.0"
+      sources."custom-event-1.0.1"
       sources."ent-2.2.0"
       sources."void-elements-2.0.1"
       sources."array-slice-0.2.3"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."eventemitter3-1.2.0"
       sources."requires-port-1.0.0"
       sources."brace-expansion-1.1.6"
@@ -21762,7 +21984,7 @@ in
       sources."uid2-0.0.3"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21782,7 +22004,7 @@ in
     dependencies = [
       sources."through2-2.0.1"
       sources."vinyl-1.2.0"
-      sources."vinyl-fs-2.4.3"
+      sources."vinyl-fs-2.4.4"
       sources."readable-stream-2.0.6"
       sources."xtend-4.0.1"
       sources."core-util-is-1.0.2"
@@ -21794,7 +22016,7 @@ in
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
-      sources."duplexify-3.4.5"
+      sources."duplexify-3.5.0"
       (sources."glob-stream-5.3.5" // {
         dependencies = [
           sources."through2-0.6.5"
@@ -21820,7 +22042,7 @@ in
       sources."wrappy-1.0.2"
       sources."extend-3.0.0"
       sources."glob-5.0.15"
-      sources."glob-parent-3.0.0"
+      sources."glob-parent-3.0.1"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -21830,14 +22052,15 @@ in
       sources."ordered-read-streams-0.3.0"
       sources."to-absolute-glob-0.1.1"
       sources."unique-stream-2.2.1"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."is-glob-3.0.0"
-      sources."is-extglob-2.0.0"
+      sources."is-glob-3.1.0"
+      sources."path-dirname-1.0.2"
+      sources."is-extglob-2.1.0"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -21850,7 +22073,7 @@ in
       sources."filename-regex-2.0.0"
       sources."kind-of-3.0.4"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -21866,7 +22089,7 @@ in
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
       sources."randomatic-1.1.5"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
       sources."for-own-0.1.4"
@@ -21997,7 +22220,7 @@ in
         ];
       })
       sources."once-1.4.0"
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."retry-0.8.0"
       sources."rimraf-2.5.4"
       sources."slide-1.1.6"
@@ -22016,17 +22239,16 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."wrappy-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      sources."bl-1.1.2"
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22036,15 +22258,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -22055,7 +22277,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22090,9 +22312,10 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      sources."glob-7.1.0"
+      sources."punycode-1.4.1"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.6"
@@ -22113,7 +22336,7 @@ in
       sources."code-point-at-1.0.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."config-chain-1.1.10"
+      sources."config-chain-1.1.11"
       sources."ini-1.3.4"
       sources."nopt-3.0.6"
       sources."osenv-0.1.3"
@@ -22153,7 +22376,7 @@ in
     };
     dependencies = [
       sources."fstream-1.0.10"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."graceful-fs-4.1.9"
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
@@ -22161,14 +22384,14 @@ in
       sources."npmlog-3.1.2"
       sources."osenv-0.1.3"
       sources."path-array-1.0.1"
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       sources."which-1.2.11"
       sources."inherits-2.0.3"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -22211,17 +22434,12 @@ in
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22231,15 +22449,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -22248,7 +22466,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22283,6 +22501,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-1.1.2"
     ];
@@ -22372,7 +22591,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -22434,7 +22653,7 @@ in
       sources."inherits-2.0.1"
       sources."setprototypeof-1.0.1"
       sources."media-typer-0.3.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
@@ -22446,22 +22665,26 @@ in
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
       sources."nan-2.4.0"
-      (sources."node-pre-gyp-0.6.30" // {
+      (sources."node-pre-gyp-0.6.31" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
-          sources."glob-7.1.0"
+          sources."glob-7.1.1"
         ];
       })
       sources."nopt-3.0.6"
       sources."npmlog-4.0.0"
-      sources."request-2.75.0"
+      (sources."request-2.76.0" // {
+        dependencies = [
+          sources."qs-6.3.0"
+        ];
+      })
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
           sources."rimraf-2.5.4"
-          sources."glob-7.1.0"
+          sources."glob-7.1.1"
         ];
       })
       sources."abbrev-1.0.9"
@@ -22486,17 +22709,12 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22506,13 +22724,13 @@ in
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -22520,7 +22738,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
@@ -22552,6 +22770,7 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
       sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
@@ -22578,10 +22797,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.30";
+    version = "0.6.31";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.30.tgz";
-      sha1 = "64d3073a6f573003717ccfe30c89023297babba1";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
@@ -22592,11 +22811,11 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
@@ -22632,17 +22851,12 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22652,15 +22866,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -22669,7 +22883,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22704,9 +22918,10 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      sources."glob-7.1.0"
+      sources."punycode-1.4.1"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -22733,13 +22948,13 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.10.2";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.10.2.tgz";
-      sha1 = "ec511e14c3ad0858fc121c6006890ed27b7c412e";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.11.0.tgz";
+      sha1 = "226c562bd2a7b13d3d7518b49ad4828a3623d06c";
     };
     dependencies = [
-      sources."chokidar-1.6.0"
+      sources."chokidar-1.6.1"
       sources."debug-2.2.0"
       sources."es6-promise-3.3.1"
       sources."ignore-by-default-1.0.1"
@@ -22773,7 +22988,7 @@ in
       sources."is-extglob-1.0.0"
       sources."kind-of-3.0.4"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
       sources."arr-flatten-1.0.1"
@@ -22784,7 +22999,7 @@ in
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
       sources."randomatic-1.1.5"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -22795,7 +23010,7 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.6.0"
+      sources."binary-extensions-1.7.0"
       sources."graceful-fs-4.1.9"
       sources."readable-stream-2.1.5"
       sources."set-immediate-shim-1.0.1"
@@ -22805,7 +23020,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.30"
+      sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.0"
@@ -22814,11 +23029,11 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
@@ -22846,17 +23061,12 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -22866,15 +23076,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -22883,7 +23093,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22918,9 +23128,10 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      sources."glob-7.1.0"
+      sources."punycode-1.4.1"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
@@ -22971,7 +23182,7 @@ in
         ];
       })
       sources."registry-url-3.1.0"
-      sources."duplexify-3.4.5"
+      sources."duplexify-3.5.0"
       sources."infinity-agent-2.0.3"
       sources."is-redirect-1.0.0"
       sources."is-stream-1.1.0"
@@ -22999,20 +23210,20 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.14.6";
+    version = "0.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.14.6.tgz";
-      sha1 = "be4520445e3c34523cba7376eac81364c054e51c";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
+      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
     };
     dependencies = [
       sources."basic-auth-1.0.4"
       sources."bcryptjs-2.3.0"
       sources."body-parser-1.15.2"
-      sources."cheerio-0.19.0"
-      sources."clone-1.0.2"
+      sources."cheerio-0.22.0"
+      sources."clone-2.0.0"
       sources."cookie-parser-1.4.3"
-      sources."cors-2.7.1"
-      sources."cron-1.1.0"
+      sources."cors-2.8.1"
+      sources."cron-1.1.1"
       sources."express-4.14.0"
       sources."follow-redirects-0.2.0"
       sources."fs-extra-0.30.0"
@@ -23020,14 +23231,15 @@ in
       sources."i18next-1.10.6"
       sources."is-utf8-0.2.1"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.13.0" // {
+      (sources."mqtt-1.14.1" // {
         dependencies = [
           sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
         ];
       })
       sources."mustache-2.2.1"
       sources."nopt-3.0.6"
-      sources."oauth2orize-1.4.0"
+      sources."oauth2orize-1.5.0"
       sources."on-headers-1.0.1"
       sources."passport-0.3.2"
       sources."passport-http-bearer-1.0.1"
@@ -23035,7 +23247,7 @@ in
       sources."raw-body-2.1.7"
       sources."semver-5.3.0"
       sources."sentiment-1.0.6"
-      (sources."uglify-js-2.7.0" // {
+      (sources."uglify-js-2.7.3" // {
         dependencies = [
           sources."async-0.2.10"
         ];
@@ -23043,22 +23255,17 @@ in
       sources."when-3.7.7"
       sources."ws-0.8.1"
       sources."xml2js-0.4.17"
-      sources."node-red-node-feedparser-0.1.5"
+      sources."node-red-node-feedparser-0.1.6"
       sources."node-red-node-email-0.1.11"
       (sources."node-red-node-twitter-0.1.7" // {
         dependencies = [
-          sources."request-2.75.0"
-          sources."bl-1.1.2"
-          sources."form-data-2.0.0"
-          sources."http-signature-1.1.1"
-          sources."tough-cookie-2.3.1"
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-          sources."assert-plus-0.2.0"
+          sources."request-2.76.0"
+          sources."form-data-2.1.1"
+          sources."qs-6.3.0"
         ];
       })
       sources."node-red-node-rbe-0.1.5"
-      sources."node-red-node-serialport-0.2.1"
+      sources."node-red-node-serialport-0.4.0"
       (sources."bcrypt-0.8.7" // {
         dependencies = [
           sources."nan-2.3.5"
@@ -23080,35 +23287,44 @@ in
       sources."ee-first-1.1.1"
       sources."mime-types-2.1.12"
       sources."mime-db-1.24.0"
-      sources."css-select-1.0.0"
-      sources."entities-1.1.1"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."domutils-1.5.1"
-          sources."entities-1.0.0"
-        ];
-      })
+      sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."lodash-3.10.1"
-      sources."css-what-1.0.0"
-      sources."domutils-1.4.3"
+      sources."entities-1.1.1"
+      sources."htmlparser2-3.9.2"
+      sources."lodash.assignin-4.2.0"
+      sources."lodash.bind-4.2.1"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.filter-4.6.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.foreach-4.5.0"
+      sources."lodash.map-4.6.0"
+      sources."lodash.merge-4.6.0"
+      sources."lodash.pick-4.4.0"
+      sources."lodash.reduce-4.6.0"
+      sources."lodash.reject-4.6.0"
+      sources."lodash.some-4.6.0"
+      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.3.0"
-      sources."readable-stream-1.1.14"
+      sources."readable-stream-2.1.5"
+      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
-      sources."moment-timezone-0.3.1"
-      sources."moment-2.15.1"
+      sources."moment-timezone-0.5.7"
+      sources."moment-2.15.2"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -23135,12 +23351,12 @@ in
       sources."stream-consume-0.1.0"
       sources."graceful-fs-4.1.9"
       sources."jsonfile-2.4.0"
-      sources."klaw-1.3.0"
+      sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."rimraf-2.5.4"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
@@ -23157,7 +23373,6 @@ in
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
         ];
       })
       (sources."end-of-stream-1.1.0" // {
@@ -23165,57 +23380,123 @@ in
           sources."once-1.3.3"
         ];
       })
-      sources."help-me-0.1.0"
+      sources."help-me-1.0.1"
       sources."minimist-1.2.0"
-      sources."mqtt-connection-2.1.1"
+      (sources."mqtt-connection-2.1.1" // {
+        dependencies = [
+          sources."through2-0.6.5"
+          sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."mqtt-packet-3.4.7"
       sources."pump-1.0.1"
       sources."reinterval-1.1.0"
-      (sources."split2-2.1.0" // {
-        dependencies = [
-          sources."through2-2.0.1"
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."split2-2.1.0"
       (sources."websocket-stream-3.3.0" // {
         dependencies = [
-          sources."through2-2.0.1"
           sources."ws-1.1.1"
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
         ];
       })
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
-      sources."process-nextick-args-1.0.7"
-      sources."util-deprecate-1.0.2"
+      sources."callback-stream-1.1.0"
+      (sources."glob-stream-5.3.5" // {
+        dependencies = [
+          sources."glob-5.0.15"
+          sources."through2-0.6.5"
+          sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
+        ];
+      })
+      (sources."through2-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."extend-3.0.0"
+      sources."glob-parent-3.0.1"
+      (sources."micromatch-2.3.11" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      sources."ordered-read-streams-0.3.0"
+      sources."to-absolute-glob-0.1.1"
+      sources."unique-stream-2.2.1"
+      sources."is-glob-3.1.0"
+      sources."path-dirname-1.0.2"
+      sources."is-extglob-2.1.0"
+      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" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+        ];
+      })
+      sources."filename-regex-2.0.0"
+      sources."kind-of-3.0.4"
+      sources."normalize-path-2.0.1"
+      sources."object.omit-2.0.1"
+      (sources."parse-glob-3.0.4" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      sources."regex-cache-0.4.3"
+      sources."arr-flatten-1.0.1"
+      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.5"
+      sources."repeat-string-1.6.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-buffer-1.1.4"
+      sources."for-own-0.1.4"
+      sources."is-extendable-0.1.1"
+      sources."for-in-0.1.6"
+      (sources."glob-base-0.3.0" // {
+        dependencies = [
+          sources."glob-parent-2.0.0"
+          sources."is-glob-2.0.1"
+          sources."is-extglob-1.0.0"
+        ];
+      })
+      sources."is-dotfile-1.0.2"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-primitive-2.0.0"
+      sources."is-stream-1.1.0"
+      sources."extend-shallow-2.0.1"
+      sources."json-stable-stringify-1.0.1"
+      sources."through2-filter-2.0.0"
+      sources."jsonify-0.0.0"
       (sources."reduplexer-1.1.0" // {
         dependencies = [
           sources."readable-stream-1.0.34"
-        ];
-      })
-      (sources."through2-0.6.5" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
         ];
       })
       (sources."bl-0.9.5" // {
         dependencies = [
           sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
         ];
       })
-      (sources."duplexify-3.4.5" // {
+      (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.1.5"
           sources."once-1.3.3"
-          sources."isarray-1.0.0"
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."buffer-shims-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
       sources."abbrev-1.0.9"
@@ -23237,68 +23518,54 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
-      sources."repeat-string-1.5.4"
-      sources."is-buffer-1.1.4"
       sources."bufferutil-1.2.1"
       sources."utf-8-validate-1.2.1"
       sources."bindings-1.2.1"
       sources."nan-2.4.0"
       sources."sax-1.2.1"
-      (sources."xmlbuilder-4.2.1" // {
-        dependencies = [
-          sources."lodash-4.16.2"
-        ];
-      })
+      sources."xmlbuilder-4.2.1"
+      sources."lodash-4.16.4"
       (sources."feedparser-1.1.3" // {
         dependencies = [
           sources."sax-0.6.1"
           sources."readable-stream-1.0.34"
+          sources."isarray-0.0.1"
         ];
       })
-      (sources."request-2.65.0" // {
+      (sources."request-2.74.0" // {
         dependencies = [
-          sources."bl-1.0.3"
-          sources."qs-5.2.1"
+          sources."bl-1.1.2"
           sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
         ];
       })
       sources."addressparser-0.1.3"
       sources."array-indexofobject-0.0.1"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
-      sources."extend-3.0.0"
+      sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.0.1"
-          sources."lodash-4.16.2"
+          sources."async-2.1.2"
         ];
       })
+      sources."har-validator-2.0.6"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
       sources."node-uuid-1.4.7"
-      sources."tunnel-agent-0.4.3"
-      sources."tough-cookie-2.2.2"
-      sources."http-signature-0.11.0"
       sources."oauth-sign-0.8.2"
-      sources."hawk-3.1.3"
-      sources."aws-sign2-0.6.0"
       sources."stringstream-0.0.5"
-      sources."combined-stream-1.0.5"
-      sources."isstream-0.1.2"
-      sources."har-validator-2.0.6"
-      sources."assert-plus-0.1.5"
-      sources."asn1-0.1.11"
-      sources."ctype-0.5.3"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -23309,18 +23576,58 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      sources."jsprim-1.3.1"
+      (sources."sshpk-1.10.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.0"
+      sources."tweetnacl-0.14.3"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
       sources."mailparser-0.6.1"
-      sources."imap-0.8.18"
+      (sources."imap-0.8.18" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."libmime-1.2.0"
       sources."mailcomposer-2.1.0"
       sources."needle-0.11.0"
       sources."nodemailer-direct-transport-1.1.0"
-      sources."nodemailer-smtp-transport-1.1.0"
+      (sources."nodemailer-smtp-transport-1.1.0" // {
+        dependencies = [
+          sources."clone-1.0.2"
+        ];
+      })
       sources."libbase64-0.1.0"
       sources."libqp-1.1.0"
       (sources."buildmail-2.0.0" // {
@@ -23346,44 +23653,18 @@ in
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
-      sources."aws4-1.4.1"
-      sources."is-typedarray-1.0.0"
       sources."asynckit-0.4.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      sources."serialport-4.0.3"
+      sources."lie-3.1.0"
+      (sources."node-pre-gyp-0.6.31" // {
         dependencies = [
-          sources."asn1-0.2.3"
-          sources."assert-plus-1.0.0"
+          sources."request-2.76.0"
+          sources."form-data-2.1.1"
+          sources."qs-6.3.0"
         ];
       })
-      sources."extsprintf-1.0.2"
-      sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
-      (sources."dashdash-1.14.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.6" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
-      sources."jodid25519-1.0.2"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
-      (sources."serialport-2.1.2" // {
-        dependencies = [
-          sources."nan-2.2.1"
-        ];
-      })
-      sources."bluebird-3.4.6"
-      sources."node-pre-gyp-0.6.30"
-      sources."node-pre-gyp-github-1.3.1"
       sources."object.assign-4.0.4"
-      sources."sf-0.1.7"
+      sources."immediate-3.0.6"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23392,11 +23673,9 @@ in
       sources."npmlog-4.0.0"
       sources."rc-1.1.6"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-          sources."isarray-1.0.0"
         ];
       })
       sources."are-we-there-yet-1.1.2"
@@ -23421,7 +23700,6 @@ in
       sources."fstream-1.0.10"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."github-0.2.4"
       sources."function-bind-1.1.0"
       sources."object-keys-1.0.11"
       sources."define-properties-1.1.2"
@@ -23499,7 +23777,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.11.0"
+      sources."coffee-script-1.11.1"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -23563,10 +23841,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "3.10.8";
+    version = "3.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz";
-      sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e";
+      url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz";
+      sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3";
     };
     dependencies = [
       sources."abbrev-1.0.9"
@@ -23578,19 +23856,19 @@ in
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
-      sources."config-chain-1.1.10"
+      sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.9"
       sources."fs-write-stream-atomic-1.0.8"
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
-      sources."glob-7.0.6"
+      sources."glob-7.1.1"
       sources."graceful-fs-4.1.9"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
       (sources."init-package-json-1.9.4" // {
@@ -23638,7 +23916,7 @@ in
       sources."read-package-tree-5.1.5"
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.74.0"
+      sources."request-2.75.0"
       sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
@@ -23724,7 +24002,7 @@ in
       sources."jju-1.3.0"
       sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -23734,7 +24012,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-1.0.1"
+      sources."form-data-2.0.0"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -23746,14 +24024,13 @@ in
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."async-2.0.1"
-      sources."lodash-4.16.2"
+      sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -23762,7 +24039,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23797,12 +24074,13 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
       sources."isexe-1.1.2"
       sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
     ];
     buildInputs = globalBuildInputs;
@@ -23850,10 +24128,10 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.0"
+      sources."coffee-script-1.11.1"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."graceful-fs-2.0.3"
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
@@ -23863,13 +24141,12 @@ in
       sources."couch-login-0.1.20"
       sources."npmlog-4.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      sources."bl-1.1.2"
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -23879,22 +24156,15 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."readable-stream-2.0.6"
-      sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -23905,7 +24175,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23940,9 +24210,11 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      sources."glob-7.1.0"
+      sources."punycode-1.4.1"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -23955,6 +24227,13 @@ in
       sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
+      sources."readable-stream-2.1.5"
+      sources."buffer-shims-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
@@ -23965,7 +24244,7 @@ in
       sources."code-point-at-1.0.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      (sources."config-chain-1.1.10" // {
+      (sources."config-chain-1.1.11" // {
         dependencies = [
           sources."ini-1.3.4"
         ];
@@ -24004,10 +24283,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.0";
+    version = "2.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.0.tgz";
-      sha1 = "8e457f49e8b73ea0c4a00ab76cd79e598bd57992";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
+      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
     };
     dependencies = [
       sources."bluebird-3.4.6"
@@ -24015,27 +24294,23 @@ in
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
       sources."commander-2.9.0"
-      sources."fast-diff-1.0.1"
+      sources."fast-diff-1.1.1"
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."lodash-3.10.1"
-      (sources."node-alias-1.0.4" // {
-        dependencies = [
-          sources."lodash-4.16.2"
-        ];
-      })
-      sources."npm-3.10.8"
+      sources."lodash-4.16.4"
+      sources."node-alias-1.0.4"
+      sources."npm-3.10.9"
       (sources."npmi-2.0.1" // {
         dependencies = [
           sources."semver-4.3.6"
         ];
       })
-      sources."require-dir-0.3.0"
+      sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      sources."spawn-please-0.1.0"
-      sources."update-notifier-0.5.0"
+      sources."spawn-please-0.2.0"
+      sources."update-notifier-1.0.2"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -24057,19 +24332,19 @@ in
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
-      sources."config-chain-1.1.10"
+      sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.9"
       sources."fs-write-stream-atomic-1.0.8"
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
-      sources."glob-7.0.6"
+      sources."glob-7.1.1"
       sources."graceful-fs-4.1.9"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
       (sources."init-package-json-1.9.4" // {
@@ -24117,7 +24392,7 @@ in
       sources."read-package-tree-5.1.5"
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.74.0"
+      sources."request-2.75.0"
       sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."sha-2.0.1"
@@ -24198,7 +24473,7 @@ in
       sources."util-extend-1.0.3"
       sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -24208,7 +24483,7 @@ in
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-1.0.1"
+      sources."form-data-2.0.0"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -24220,18 +24495,14 @@ in
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      (sources."async-2.0.1" // {
-        dependencies = [
-          sources."lodash-4.16.2"
-        ];
-      })
-      sources."is-my-json-valid-2.14.0"
+      sources."asynckit-0.4.0"
+      sources."is-my-json-valid-2.15.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
@@ -24265,43 +24536,52 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
       sources."isexe-1.1.2"
       sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."configstore-1.4.0"
+      sources."boxen-0.6.0"
+      sources."configstore-2.1.0"
       sources."is-npm-1.0.0"
-      sources."latest-version-1.0.1"
-      sources."repeating-1.1.3"
+      sources."latest-version-2.0.0"
+      sources."lazy-req-1.1.0"
       sources."semver-diff-2.1.0"
-      sources."string-length-1.0.1"
-      sources."uuid-2.0.3"
       sources."xdg-basedir-2.0.0"
-      sources."package-json-1.2.0"
-      (sources."got-3.3.1" // {
-        dependencies = [
-          sources."object-assign-3.0.0"
-        ];
-      })
+      sources."ansi-align-1.1.0"
+      sources."camelcase-2.1.1"
+      sources."cli-boxes-1.0.0"
+      sources."filled-array-1.1.0"
+      sources."repeating-2.0.1"
+      sources."widest-line-1.0.0"
+      sources."is-finite-1.0.2"
+      sources."dot-prop-3.0.0"
+      sources."uuid-2.0.3"
+      sources."is-obj-1.0.1"
+      sources."package-json-2.4.0"
+      sources."got-5.6.0"
+      sources."registry-auth-token-3.1.0"
       sources."registry-url-3.1.0"
-      sources."duplexify-3.4.5"
-      sources."infinity-agent-2.0.3"
+      sources."create-error-class-3.0.2"
+      sources."duplexer2-0.1.4"
+      sources."is-plain-obj-1.1.0"
       sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."nested-error-stacks-1.0.2"
-      sources."prepend-http-1.0.4"
+      sources."node-status-codes-1.0.0"
+      sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
       sources."timed-out-2.0.0"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
-      sources."stream-shift-1.0.0"
+      sources."unzip-response-1.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."error-ex-1.3.0"
+      sources."is-arrayish-0.2.1"
+      sources."prepend-http-1.0.4"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -24309,7 +24589,6 @@ in
       })
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-1.0.4"
-      sources."is-finite-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24322,22 +24601,22 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.35.1";
+    version = "0.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.35.1.tgz";
-      sha1 = "bcd9e77044e6f2c1f508d3cb913a39b8245fe072";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
+      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
     };
     dependencies = [
       sources."airplayer-2.0.0"
-      sources."clivas-0.1.4"
-      (sources."inquirer-0.8.5" // {
+      sources."clivas-0.2.0"
+      (sources."inquirer-1.2.2" // {
         dependencies = [
-          sources."ansi-regex-1.1.1"
+          sources."lodash-4.16.4"
         ];
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
-      sources."network-address-0.0.5"
+      sources."network-address-1.1.0"
       sources."numeral-1.5.3"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
@@ -24350,17 +24629,9 @@ in
           sources."get-stdin-5.0.1"
         ];
       })
-      (sources."pump-0.3.5" // {
-        dependencies = [
-          sources."once-1.2.0"
-        ];
-      })
+      sources."pump-1.0.1"
       sources."range-parser-1.2.0"
-      (sources."rc-0.4.0" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
+      sources."rc-1.1.6"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -24447,7 +24718,7 @@ in
       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.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
@@ -24468,36 +24739,44 @@ in
       sources."repeating-2.0.1"
       sources."is-finite-1.0.2"
       sources."get-stdin-4.0.1"
-      sources."cli-width-1.1.1"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.1.0"
+      sources."external-editor-1.1.1"
       sources."figures-1.7.0"
-      (sources."readline2-0.1.1" // {
-        dependencies = [
-          sources."strip-ansi-2.0.1"
-          sources."ansi-regex-1.1.1"
-        ];
-      })
-      sources."rx-2.5.3"
+      sources."mute-stream-0.0.6"
+      sources."run-async-2.2.0"
+      sources."rx-4.1.0"
       sources."through-2.3.8"
-      sources."mute-stream-0.0.4"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."extend-3.0.0"
+      sources."spawn-sync-1.0.15"
+      sources."tmp-0.0.29"
+      sources."os-shim-0.1.3"
+      sources."os-tmpdir-1.0.2"
+      sources."is-promise-2.1.0"
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.4"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.2.3"
+      sources."simple-get-2.3.0"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-0.10.0"
       sources."simple-sha1-2.0.8"
       sources."rusha-0.8.4"
-      sources."unzip-response-1.0.1"
-      (sources."end-of-stream-1.0.0" // {
+      sources."simple-concat-1.0.0"
+      sources."unzip-response-2.0.1"
+      (sources."end-of-stream-1.1.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
       })
-      sources."deep-extend-0.2.11"
-      sources."strip-json-comments-0.1.3"
-      sources."ini-1.1.0"
+      sources."deep-extend-0.4.1"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-1.0.4"
       sources."bitfield-0.1.0"
       sources."bncode-0.5.3"
       (sources."fs-chunk-store-1.6.4" // {
@@ -24536,9 +24815,9 @@ in
       sources."speedometer-0.1.4"
       sources."utp-0.0.7"
       sources."cyclist-0.1.1"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.6"
@@ -24811,9 +25090,9 @@ in
       })
       sources."fifo-0.1.4"
       sources."speedometer-0.1.4"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.6"
@@ -24864,12 +25143,12 @@ in
       sources."pend-1.2.0"
       sources."graceful-fs-4.1.9"
       sources."jsonfile-2.4.0"
-      sources."klaw-1.3.0"
+      sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."rimraf-2.5.4"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
@@ -24899,8 +25178,8 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.0.1"
-      sources."lodash-4.16.2"
+      sources."async-2.1.2"
+      sources."lodash-4.16.4"
       sources."mime-db-1.24.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
@@ -24935,7 +25214,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -24945,7 +25224,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -24976,7 +25255,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."detective-4.3.1"
+      sources."detective-4.3.2"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.9"
       sources."iconv-lite-0.4.13"
@@ -24985,9 +25264,9 @@ in
       sources."q-1.4.1"
       sources."recast-0.10.43"
       sources."graceful-readlink-1.0.1"
-      sources."acorn-1.2.2"
+      sources."acorn-3.3.0"
       sources."defined-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -25082,9 +25361,9 @@ in
       sources."request-2.9.203"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."request-2.75.0"
+          sources."request-2.76.0"
           sources."node-uuid-1.4.7"
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
         ];
       })
       sources."node-swt-0.1.1"
@@ -25092,18 +25371,12 @@ in
       sources."formidable-1.0.11"
       sources."crc-0.2.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       (sources."har-validator-2.0.6" // {
         dependencies = [
           sources."commander-2.9.0"
@@ -25117,14 +25390,12 @@ in
       sources."mime-types-2.1.12"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."process-nextick-args-1.0.7"
-      sources."util-deprecate-1.0.2"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -25135,7 +25406,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -25170,6 +25441,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
     buildInputs = globalBuildInputs;
@@ -25228,19 +25500,19 @@ in
           sources."depd-1.1.0"
         ];
       })
-      (sources."request-2.75.0" // {
+      (sources."request-2.76.0" // {
         dependencies = [
-          sources."qs-6.2.1"
+          sources."qs-6.3.0"
         ];
       })
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.1"
+      sources."bunyan-1.8.4"
       sources."handlebars-2.0.0"
       sources."highlight.js-8.9.1"
-      sources."lunr-0.7.1"
+      sources."lunr-0.7.2"
       sources."render-readme-1.3.1"
       sources."jju-1.3.0"
       sources."JSONStream-1.2.1"
@@ -25329,17 +25601,12 @@ in
       sources."sprintf-js-1.0.3"
       sources."keygrip-1.0.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -25349,17 +25616,12 @@ in
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -25369,7 +25631,7 @@ in
       sources."ansi-regex-2.0.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -25403,12 +25665,13 @@ in
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.6.0"
+      sources."dtrace-provider-0.7.1"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.15.1"
+      sources."moment-2.15.2"
       sources."nan-2.4.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -25417,7 +25680,7 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.6"
@@ -25438,7 +25701,7 @@ in
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
       sources."uc.micro-1.0.3"
-      (sources."htmlparser2-3.9.1" // {
+      (sources."htmlparser2-3.9.2" // {
         dependencies = [
           sources."readable-stream-2.1.5"
         ];
@@ -25453,6 +25716,11 @@ in
         ];
       })
       sources."buffer-shims-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
       sources."jsonparse-1.2.0"
       sources."through-2.3.8"
       sources."minimist-0.0.8"
@@ -25602,7 +25870,7 @@ in
       sources."rimraf-2.4.5"
       sources."minimist-0.0.8"
       sources."glob-6.0.4"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."path-is-absolute-1.0.1"
@@ -25664,7 +25932,7 @@ in
       sources."minimist-0.0.8"
       sources."ms-0.7.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -25785,14 +26053,14 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.0.1"
+          sources."async-2.1.2"
         ];
       })
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.12"
       sources."qs-4.0.0"
       sources."tunnel-agent-0.4.3"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."http-signature-0.11.0"
       sources."oauth-sign-0.8.2"
       sources."hawk-3.1.3"
@@ -25808,8 +26076,9 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."lodash-4.16.2"
+      sources."lodash-4.16.4"
       sources."mime-db-1.24.0"
+      sources."punycode-1.4.1"
       sources."assert-plus-0.1.5"
       sources."asn1-0.1.11"
       sources."ctype-0.5.3"
@@ -25821,7 +26090,7 @@ in
       sources."bluebird-2.11.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -25831,7 +26100,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."uglify-to-browserify-1.0.2"
@@ -25861,10 +26130,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.3";
+    version = "2.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz";
-      sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz";
+      sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -25877,10 +26146,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.3";
+    version = "2.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-      sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -25898,7 +26167,7 @@ in
       sources."lazy-cache-1.0.4"
       sources."kind-of-3.0.4"
       sources."longest-1.0.1"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
     ];
     buildInputs = globalBuildInputs;
@@ -25969,15 +26238,16 @@ in
       })
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
-          sources."request-2.75.0"
+          sources."request-2.76.0"
           sources."retry-0.8.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-2.0.0"
+          sources."form-data-2.1.1"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."tough-cookie-2.3.1"
+          sources."qs-6.3.0"
+          sources."tough-cookie-2.3.2"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -26170,7 +26440,7 @@ in
       })
       sources."extract-opts-3.3.1"
       sources."eachr-3.2.0"
-      sources."editions-1.1.2"
+      sources."editions-1.3.1"
       sources."typechecker-4.3.0"
       sources."underscore-1.5.2"
       sources."abbrev-1.0.9"
@@ -26181,7 +26451,7 @@ in
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
-      sources."config-chain-1.1.10"
+      sources."config-chain-1.1.11"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.9"
@@ -26197,7 +26467,7 @@ in
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       (sources."init-package-json-1.9.4" // {
         dependencies = [
           sources."glob-6.0.4"
@@ -26319,7 +26589,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
+      sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -26335,7 +26605,7 @@ in
       sources."tough-cookie-2.2.2"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -26344,7 +26614,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26379,7 +26649,7 @@ in
       sources."builtins-0.0.7"
       sources."isexe-1.1.2"
       sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.3"
+      sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -26388,6 +26658,7 @@ in
       })
       sources."typedarray-0.0.6"
       sources."asynckit-0.4.0"
+      sources."punycode-1.4.1"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
@@ -26529,7 +26800,7 @@ in
       })
       sources."tmp-0.0.29"
       sources."follow-redirects-0.0.3"
-      (sources."config-chain-1.1.10" // {
+      (sources."config-chain-1.1.11" // {
         dependencies = [
           sources."ini-1.3.4"
         ];
@@ -26569,12 +26840,12 @@ in
       sources."pend-1.2.0"
       sources."graceful-fs-4.1.9"
       sources."jsonfile-2.4.0"
-      sources."klaw-1.3.0"
+      sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."rimraf-2.5.4"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -26602,8 +26873,8 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.0.1"
-      sources."lodash-4.16.2"
+      sources."async-2.1.2"
+      sources."lodash-4.16.4"
       sources."mime-db-1.24.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
@@ -26638,7 +26909,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -26648,7 +26919,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -26667,10 +26938,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.2";
+    version = "1.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.2.tgz";
-      sha1 = "f11a96f458eb752970a86abe746c0704fabafaf3";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
+      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
     };
     dependencies = [
       sources."async-1.5.2"
@@ -26694,7 +26965,7 @@ in
       sources."optimist-0.6.1"
       sources."supports-color-3.1.2"
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.6.4" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
         ];
@@ -26711,7 +26982,7 @@ in
       })
       sources."graceful-fs-4.1.9"
       sources."big.js-3.1.3"
-      sources."emojis-list-2.0.1"
+      sources."emojis-list-2.1.0"
       sources."json5-0.5.0"
       sources."object-assign-4.1.0"
       sources."errno-0.1.4"
@@ -26761,7 +27032,7 @@ in
       sources."vm-browserify-0.0.4"
       sources."pako-0.2.9"
       sources."base64-js-1.2.0"
-      sources."ieee754-1.1.6"
+      sources."ieee754-1.1.8"
       sources."date-now-0.1.4"
       sources."pbkdf2-compat-2.0.1"
       sources."ripemd160-0.2.0"
@@ -26788,9 +27059,9 @@ in
       sources."lazy-cache-1.0.4"
       sources."kind-of-3.0.4"
       sources."longest-1.0.1"
-      sources."repeat-string-1.5.4"
+      sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
-      sources."chokidar-1.6.0"
+      sources."chokidar-1.6.1"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -26809,7 +27080,7 @@ in
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
       sources."normalize-path-2.0.1"
-      sources."object.omit-2.0.0"
+      sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
       sources."arr-flatten-1.0.1"
@@ -26828,14 +27099,14 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.6.0"
+      sources."binary-extensions-1.7.0"
       sources."minimatch-3.0.3"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.30"
+      sources."node-pre-gyp-0.6.31"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.0"
       (sources."rc-1.1.6" // {
@@ -26843,11 +27114,11 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."request-2.75.0"
+      sources."request-2.76.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.1.4" // {
+      (sources."tar-pack-3.3.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
@@ -26873,17 +27144,12 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.4.1"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."aws4-1.5.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.0.0"
+      sources."form-data-2.1.1"
       sources."har-validator-2.0.6"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
@@ -26893,9 +27159,9 @@ in
       sources."mime-types-2.1.12"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.3.0"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.1"
+      sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
@@ -26905,7 +27171,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.14.0"
+      sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -26913,7 +27179,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-2.0.0"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26948,9 +27214,9 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."mime-db-1.24.0"
-      sources."glob-7.1.0"
+      sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.5"
+      sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1bd4014d35a..9fc9dcf2d7b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -43,6 +43,7 @@
 , "npm"
 , { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
 , "npm-check-updates"
+, "parsoid"
 , "peerflix"
 , "peerflix-server"
 , "phantomjs"
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
new file mode 100644
index 00000000000..b8017134e52
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -0,0 +1,45 @@
+{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}:
+
+buildOcaml rec {
+  version = "0.8.2";
+  name = "ptime";
+
+  src = fetchurl {
+    url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
+    sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj";
+  };
+
+  unpackCmd = "tar -xf $curSrc";
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+
+  propagatedBuildInputs = [ result ];
+
+  buildPhase = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false
+  '';
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ptime.install | sh
+    ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib
+  '';
+
+  meta = {
+    homepage = http://erratique.ch/software/ptime;
+    description = "POSIX time for OCaml";
+    longDescription = ''
+      Ptime has platform independent POSIX time support in pure OCaml.
+      It provides a type to represent a well-defined range of POSIX timestamps
+      with picosecond precision, conversion with date-time values, conversion
+      with RFC 3339 timestamps and pretty printing to a human-readable,
+      locale-independent representation.
+
+      The additional Ptime_clock library provides access to a system POSIX clock
+      and to the system's current time zone offset.
+
+      Ptime is not a calendar library.
+    '';
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
new file mode 100644
index 00000000000..5dbc74ef543
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools }:
+
+assert stdenv.lib.versionAtLeast ocaml.version "4.02";
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-${version}";
+  version = "1.99.3";
+
+  src = fetchzip {
+    url = "http://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz";
+    sha256 = "1wghjy3qyj43ll1ikchlqy7fv2hxcn3ap9xgsscm2ch09d8dcv7y";
+  };
+
+  buildInputs = [ ocaml findlib ppx_tools ];
+
+  propagatedBuildInputs = [ gen ];
+
+  buildFlags = [ "all" "opt" ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/alainfrisch/sedlex;
+    description = "An OCaml lexer generator for Unicode";
+    license = stdenv.lib.licenses.mit;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 09cefdfbb69..2cb4fdcd301 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ocaml findlib pkgconfig perl ];
   propagatedBuildInputs = [ gmp ];
 
-  patchPhase = ''
-    substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl'
-  '';
+  patchPhase = "patchShebangs ./z_pp.pl";
   configurePhase = ''
     ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
   '';
diff --git a/pkgs/development/python-modules/mezzanine/writable_settings.patch b/pkgs/development/python-modules/mezzanine/writable_settings.patch
new file mode 100644
index 00000000000..4b5be7b5950
--- /dev/null
+++ b/pkgs/development/python-modules/mezzanine/writable_settings.patch
@@ -0,0 +1,21 @@
+diff -Nur mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py
+--- mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py	2014-08-30 07:12:19.000000000 +0200
++++ mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py	2016-10-31 14:47:30.982401818 +0100
+@@ -5,6 +5,7 @@
+ from distutils.dir_util import copy_tree
+ from optparse import OptionParser
+ import os
++import stat
+ from shutil import move
+ from uuid import uuid4
+ 
+@@ -61,6 +62,9 @@
+         copy_tree(os.path.join(package_path, "project_template"), project_path)
+         move(local_settings_path + ".template", local_settings_path)
+ 
++    os.chmod(local_settings_path,
++             os.stat(local_settings_path).st_mode | stat.S_IWRITE)
++
+     # Generate a unique SECRET_KEY for the project's setttings module.
+     with open(local_settings_path, "r") as f:
+         data = f.read()
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index cc34a73ecd5..2bfec89aa66 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bear-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = "Bear";
     rev = version;
-    sha256 = "08llfqg8y6d7vfwaw5plrk1rrqzs0ywi2ldnlwvy917603971rg0";
+    sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # all fail
 
+  patches = [ ./ignore_wrapper.patch ];
+
   meta = with stdenv.lib; {
     description = "Tool that generates a compilation database for clang tooling";
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
new file mode 100644
index 00000000000..16d7a9bfd3e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
@@ -0,0 +1,31 @@
+--- Bear-2.2.1-src/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
++++ Bear-2.2.1-src-patch/bear/main.py.in	2016-11-02 20:23:38.050134984 +0100
+@@ -48,6 +48,7 @@
+ import shutil
+ import contextlib
+ import logging
++from distutils.spawn import find_executable
+ 
+ # Ignored compiler options map for compilation database creation.
+ # The map is used in `split_command` method. (Which does ignore and classify
+@@ -447,7 +448,6 @@
+     # do extra check on number of source files
+     return result if result.files else None
+ 
+-
+ def split_compiler(command):
+     """ A predicate to decide the command is a compiler call or not.
+ 
+@@ -467,7 +467,11 @@
+                    for pattern in COMPILER_CPP_PATTERNS)
+ 
+     if command:  # not empty list will allow to index '0' and '1:'
+-        executable = os.path.basename(command[0])
++        absolute_executable = os.path.realpath(find_executable(command[0]))
++        if 'wrapper' in absolute_executable:
++            return None
++
++        executable = os.path.basename(absolute_executable)
+         parameters = command[1:]
+         # 'wrapper' 'parameters' and
+         # 'wrapper' 'compiler' 'parameters' are valid.
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 7c831585956..e789370d585 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,38 +1,64 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
-stdenv.mkDerivation rec {
-  name = "electron-${version}";
+let
   version = "1.2.2";
-
-  src = fetchurl {
-    url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-    sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
-    name = "${name}.zip";
-  };
-
-  buildInputs = [ unzip makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out/lib/electron $out/bin
-    unzip -d $out/lib/electron $src
-    ln -s $out/lib/electron/electron $out/bin
-
-    fixupPhase
-
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
-      $out/lib/electron/electron
-
-    wrapProgram $out/lib/electron/electron \
-      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
-  '';
+  name = "electron-${version}";
 
   meta = with stdenv.lib; {
     description = "Cross platform desktop application shell";
     homepage = https://github.com/electron/electron;
     license = licenses.mit;
     maintainers = [ maintainers.travisbhartwell ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
   };
-}
+
+  linux = {
+    inherit name version meta;
+
+    src = fetchurl {
+      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+      sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
+      name = "${name}.zip";
+    };
+
+    buildInputs = [ unzip makeWrapper ];
+
+    buildCommand = ''
+      mkdir -p $out/lib/electron $out/bin
+      unzip -d $out/lib/electron $src
+      ln -s $out/lib/electron/electron $out/bin
+
+      fixupPhase
+
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
+        $out/lib/electron/electron
+
+      wrapProgram $out/lib/electron/electron \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
+    '';
+  };
+
+  darwin = {
+    inherit name version meta;
+
+    src = fetchurl {
+      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
+      sha256 = "0rqlpj3400qjsfj8k4lwajrwv5l6f8mhrpvsma7p36fw5qjbwp1z";
+      name = "${name}.zip";
+    };
+
+    buildInputs = [ unzip ];
+
+    buildCommand = ''
+    mkdir -p $out/Applications
+    unzip $src
+    mv Electron.app $out/Applications
+    mkdir -p $out/bin
+    ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron
+    '';
+  };
+in
+
+  stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux)
diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
index 81a3a20381e..82d6492ce18 100644
--- a/pkgs/development/tools/haskell/tinc/default.nix
+++ b/pkgs/development/tools/haskell/tinc/default.nix
@@ -7,12 +7,12 @@
 }:
 mkDerivation {
   pname = "tinc";
-  version = "20160924";
+  version = "20161102";
   src = fetchFromGitHub {
     owner = "sol";
     repo = "tinc";
-    rev = "f5ba99264930a2af2f24770a23af2613acdac631";
-    sha256 = "19mvswpjak9dxpd4w86fz1wv0zkn6ippc37gdkhyg4xcj9jn21a9";
+    rev = "411d0f319717d01dc71bd5c1faef8035656eaf3d";
+    sha256 = "040vyg9n7ihnqs6fyhhr5p4xscfxhji02wsfw4nncpxflzaciji5";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 7c92df30311..a45a95680b1 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,67 +1,69 @@
 { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
-, version
-, sha256 ? null
-, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; }
-, preBuild ? ""
-, extraConfigFlags ? []
-, extraBuildInputs ? []
-, patches ? [],
- ...
+, pkgconfig, runCommand, which, libtool, fetchpatch
+, callPackage
+, darwin ? null
+, enableNpm ? true
 }:
 
-assert stdenv.system != "armv5tel-linux";
+with stdenv.lib;
 
 let
 
-  deps = {
-    inherit openssl zlib libuv;
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  });
+  inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
 
-  sharedConfigureFlags = name: [
+  sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
+
+  sharedConfigureFlags = concatMap (name: [
     "--shared-${name}"
-    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
-    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
-  ];
+    "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib"
+    /** Closure notes: we explicitly avoid specifying --shared-*-includes,
+     *  as that would put the paths into bin/nodejs.
+     *  Including pkgconfig in build inputs would also have the same effect!
+     */
+  ]) (builtins.attrNames sharedLibDeps);
 
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
+  extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
+in
 
-in stdenv.mkDerivation {
+  rec {
 
-  inherit version src preBuild;
-
-  name = "nodejs-${version}";
-
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags;
-  dontDisableStatic = true;
-  prePatch = ''
-    patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
-  '';
-
-  postInstall = ''
-    PATH=$out/bin:$PATH patchShebangs $out
-  '';
-
-  patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
-
-  buildInputs = extraBuildInputs
+    buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
     ++ [ python2 which zlib libuv openssl ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
     ++ optionals stdenv.isDarwin [ pkgconfig libtool ];
-  setupHook = ./setup-hook.sh;
 
-  enableParallelBuilding = true;
+    configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;
 
-  passthru.interpreterName = "nodejs";
+    dontDisableStatic = true;
 
-  meta = {
-    description = "Event-driven I/O framework for the V8 JavaScript engine";
-    homepage = http://nodejs.org;
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan maintainers.cko ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
+    enableParallelBuilding = true;
+
+    passthru.interpreterName = "nodejs";
+
+
+    setupHook = ./setup-hook.sh;
+
+    patches = optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
+    preBuild = optionalString stdenv.isDarwin ''
+      sed -i -e "s|tr1/type_traits|type_traits|g" \
+      -e "s|std::tr1|std|" src/util.h
+    '';
+
+    prePatch = ''
+      patchShebangs .
+      sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
+    '';
+
+    postInstall = ''
+      PATH=$out/bin:$PATH patchShebangs $out
+    '';
+
+    meta = {
+      description = "Event-driven I/O framework for the V8 JavaScript engine";
+      homepage = http://nodejs.org;
+      license = licenses.mit;
+      maintainers = with maintainers; [ goibhniu havvy gilligan cko ];
+      platforms = platforms.linux ++ platforms.darwin;
+    };
 }
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index f0a505a683a..04ea7086f74 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
+, pkgconfig, runCommand, which, libtool, fetchpatch
 , callPackage
+, darwin ? null
+, enableNpm ? true
 }@args:
 
-import ./nodejs.nix (args // rec {
-  version = "4.6.0";
-  src = fetchurl {
-    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-    sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
-  };
+let
+  nodejs = import ./nodejs.nix args;
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+in
+  stdenv.mkDerivation (nodejs // rec {
+    version = "4.6.0";
+    name = "${baseName}-${version}";
+    src = fetchurl {
+      url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
+      sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
+    };
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace src/util.h \
-      --replace "tr1/type_traits" "type_traits"
-  '';
-})
+  })
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index a2213546ec4..50bd2cb672e 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -2,24 +2,27 @@
 , pkgconfig, runCommand, which, libtool, fetchpatch
 , callPackage
 , darwin ? null
+, enableNpm ? true
 }@args:
 
 let
-  inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+  nodejs = import ./nodejs.nix args;
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+in
+  stdenv.mkDerivation (nodejs // rec {
+    version = "6.8.0";
+    name = "${baseName}-${version}";
+    src = fetchurl {
+      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
+      sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq";
+    };
+
+    patches = nodejs.patches ++ [
+      (fetchpatch {
+        url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
+        sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
+      })
+    ];
+
+  })
 
-in import ./nodejs.nix (args // rec {
-  version = "6.8.0";
-  sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq";
-  extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin
-    [ CoreServices ApplicationServices ];
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i -e "s|tr1/type_traits|type_traits|g" \
-      -e "s|std::tr1|std|" src/util.h
-  '';
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
-      sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
-    })
-  ];
-})
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
new file mode 100644
index 00000000000..420f2b0412f
--- /dev/null
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, libtool, fetchpatch
+, callPackage
+, darwin ? null
+, enableNpm ? true
+}@args:
+
+let
+  nodejs = import ./nodejs.nix args;
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+in
+  stdenv.mkDerivation (nodejs // rec {
+    version = "7.0.0";
+    name = "${baseName}-${version}";
+    src = fetchurl {
+      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
+      sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71";
+    };
+
+    patches = nodejs.patches ++ [
+      (fetchpatch {
+        url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
+        sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
+      })
+    ];
+
+  })
+
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index aea36d211aa..98603251e59 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, version, releaseType }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "0ad-data-${version}";
+  version = "0.0.20";
 
   src = fetchurl {
-    url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
+    url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
     sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv";
   };
 
-  patchPhase = ''
+  installPhase = ''
     rm binaries/data/tools/fontbuilder/fonts/*.txt
+    mkdir -p $out/share/0ad
+    cp -r binaries/data $out/share/0ad/
   '';
 
-  installPhase = ''
-    mkdir -p $out/share/0ad
-    cp -r binaries/data/* $out/share/0ad/
-  '';
+  meta = with stdenv.lib; {
+    description = "A free, open-source game of ancient warfare -- data files";
+    homepage = "http://wildfiregames.com/0ad/";
+    license = licenses.cc-by-sa-30;
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 0a2c342e8ed..983e8accc20 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,131 +1,14 @@
-{ stdenv, callPackage, fetchurl, python27
-, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
-, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
-, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2
-, gloox, nvidia-texture-tools
-, withEditor ? true, wxGTK ? null
-}:
-
-assert withEditor -> wxGTK != null;
+{ newScope }:
 
 let
-  version = "0.0.20";
+  callPackage = newScope self;
 
-  releaseType = "alpha";
+  self = {
+    zeroad-unwrapped = callPackage ./game.nix { };
 
-  zeroadData = callPackage ./data.nix { inherit version releaseType; };
+    zeroad-data = callPackage ./data.nix { };
 
-  archForPremake =
-    if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else
-    if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR";
-
-in
-stdenv.mkDerivation rec {
-  name = "0ad-${version}";
-
-  src = fetchurl {
-    url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
-    sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3";
+    zeroad = callPackage ./wrapper.nix { };
   };
 
-  buildInputs = [
-    zeroadData python27 pkgconfig spidermonkey_31 boost icu
-    libxml2 libpng libjpeg zlib curl libogg libvorbis enet
-    miniupnpc openal mesa xproto libX11 libXcursor nspr
-    SDL SDL2 gloox nvidia-texture-tools
-  ] ++ stdenv.lib.optional withEditor wxGTK;
-
-  NIX_CFLAGS_COMPILE = [
-    "-I${xproto}/include/X11"
-    "-I${libX11.dev}/include/X11"
-    "-I${libXcursor.dev}/include/X11"
-    "-I${SDL.dev}/include/SDL"
-    "-I${SDL2}/include/SDL2"
-  ];
-
-  patchPhase = ''
-    sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
-  '';
-
-  configurePhase = ''
-    # Delete shipped libraries which we don't need.
-    rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
-
-    # Build shipped premake.
-    make -C build/premake/premake4/build/gmake.unix
-
-    # Run premake.
-    pushd build/premake
-    ./premake4/bin/release/premake4 \
-      --file="premake4.lua" \
-      --outpath="../workspaces/gcc/" \
-      --platform=${archForPremake} \
-      --os=linux \
-      --with-system-nvtt \
-      --with-system-enet \
-      --with-system-miniupnpc \
-      --with-system-mozjs31 \
-      ${ if withEditor then "--atlas" else "" } \
-      --collada \
-      --bindir="$out"/bin \
-      --libdir="$out"/lib/0ad \
-      --datadir="$out"/share/0ad \
-      --without-tests \
-      gmake
-    popd
-  '';
-
-  buildPhase = ''
-    # Build bundled fcollada.
-    make -C libraries/source/fcollada/src
-
-    # Build 0ad.
-    make -C build/workspaces/gcc verbose=1
-  '';
-
-  installPhase = ''
-    # Copy executables.
-    mkdir -p "$out"/bin
-    cp binaries/system/pyrogenesis "$out"/bin/0ad
-    ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/
-
-    # Copy l10n data.
-    mkdir -p "$out"/share/0ad
-    cp -r binaries/data/l10n "$out"/share/0ad/
-
-    # Copy libraries.
-    mkdir -p "$out"/lib/0ad
-    cp binaries/system/libCollada.so "$out"/lib/0ad/
-    ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/
-
-    # Create links to data files.
-    ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/*
-
-    # Copy icon.
-    mkdir -p "$out"/share/icons
-    cp build/resources/0ad.png "$out"/share/icons/
-
-    # Copy/fix desktop item.
-    mkdir -p "$out"/share/applications
-    while read LINE; do
-      if [[ $LINE = "Exec=0ad" ]]; then
-        echo "Exec=$out/bin/zeroad"
-      elif [[ $LINE = "Icon=0ad" ]]; then
-        echo "Icon=$out/share/icons/0ad.png"
-      else
-        echo "$LINE"
-      fi
-    done <build/resources/0ad.desktop >"$out"/share/applications/0ad.desktop
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A free, open-source game of ancient warfare";
-    homepage = "http://wildfiregames.com/0ad/";
-    license = with licenses; [
-      gpl2 lgpl21 mit cc-by-sa-30
-      licenses.zlib # otherwise masked by pkgs.zlib
-    ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    hydraPlatforms = []; # the data are too big (~1.5 GB)
-  };
-}
+in self
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
new file mode 100644
index 00000000000..e4d4e3cb8e4
--- /dev/null
+++ b/pkgs/games/0ad/game.nix
@@ -0,0 +1,96 @@
+{ stdenv, lib, callPackage, perl, fetchurl, python2
+, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
+, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
+, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2
+, gloox, nvidia-texture-tools
+, withEditor ? true, wxGTK ? null
+}:
+
+assert withEditor -> wxGTK != null;
+
+stdenv.mkDerivation rec {
+  name = "0ad-${version}";
+  version = "0.0.20";
+
+  src = fetchurl {
+    url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
+    sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3";
+  };
+
+  nativeBuildInputs = [ python2 perl pkgconfig ];
+
+  buildInputs = [
+    spidermonkey_31 boost icu libxml2 libpng libjpeg
+    zlib curl libogg libvorbis enet miniupnpc openal
+    mesa xproto libX11 libXcursor nspr SDL2 gloox
+    nvidia-texture-tools
+  ] ++ lib.optional withEditor wxGTK;
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${xproto}/include/X11"
+    "-I${libX11.dev}/include/X11"
+    "-I${libXcursor.dev}/include/X11"
+    "-I${SDL.dev}/include/SDL"
+    "-I${SDL2}/include/SDL2"
+  ];
+
+  patches = [ ./rootdir_env.patch ];
+
+  postPatch = ''
+    sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
+  '';
+
+  configurePhase = ''
+    # Delete shipped libraries which we don't need.
+    rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
+
+    # Update Makefiles
+    pushd build/workspaces
+    ./update-workspaces.sh \
+      --with-system-nvtt \
+      --with-system-mozjs31 \
+      ${lib.optionalString withEditor "--enable-atlas"} \
+      --bindir="$out"/bin \
+      --libdir="$out"/lib/0ad \
+      --without-tests \
+      -j $NIX_BUILD_CORES
+    popd
+
+    # Move to the build directory.
+    pushd build/workspaces/gcc
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    popd
+
+    # Copy executables.
+    install -Dm755 binaries/system/pyrogenesis "$out"/bin/0ad
+    ${lib.optionalString withEditor ''
+      install -Dm755 binaries/system/ActorEditor "$out"/bin/ActorEditor
+    ''}
+
+    # Copy l10n data.
+    mkdir -p "$out"/share/0ad/data
+    cp -r binaries/data/l10n "$out"/share/0ad/data
+
+    # Copy libraries.
+    mkdir -p "$out"/lib/0ad
+    cp binaries/system/*.so "$out"/lib/0ad/
+
+    # Copy icon.
+    install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png
+    install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free, open-source game of ancient warfare";
+    homepage = "http://wildfiregames.com/0ad/";
+    license = with licenses; [
+      gpl2 lgpl21 mit cc-by-sa-30
+      licenses.zlib # otherwise masked by pkgs.zlib
+    ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch
new file mode 100644
index 00000000000..c001473e510
--- /dev/null
+++ b/pkgs/games/0ad/rootdir_env.patch
@@ -0,0 +1,38 @@
+diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp
+--- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp	2015-02-14 04:45:13.000000000 +0300
++++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp	2016-11-03 16:23:47.241514876 +0300
+@@ -155,32 +155,8 @@
+ 
+ /*static*/ OsPath Paths::Root(const OsPath& argv0)
+ {
+-#if OS_ANDROID
+-	return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
+-#else
+-
+-	// get full path to executable
+-	OsPath pathname = sys_ExecutablePathname();	// safe, but requires OS-specific implementation
+-	if(pathname.empty())	// failed, use argv[0] instead
+-	{
+-		errno = 0;
+-		pathname = wrealpath(argv0);
+-		if(pathname.empty())
+-			WARN_IF_ERR(StatusFromErrno());
+-	}
+-
+-	// make sure it's valid
+-	if(!FileExists(pathname))
+-	{
+-		LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
+-		WARN_IF_ERR(StatusFromErrno());
+-	}
+-
+-	for(size_t i = 0; i < 2; i++)	// remove "system/name.exe"
+-		pathname = pathname.Parent();
+-	return pathname;
+-
+-#endif
++	UNUSED2(argv0);
++	return getenv("ZEROAD_ROOTDIR");
+ }
+ 
+ /*static*/ OsPath Paths::RootData(const OsPath& argv0)
diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix
new file mode 100644
index 00000000000..ca7c8e16e3c
--- /dev/null
+++ b/pkgs/games/0ad/wrapper.nix
@@ -0,0 +1,21 @@
+{ buildEnv, makeWrapper, zeroad-unwrapped, zeroad-data }:
+
+assert zeroad-unwrapped.version == zeroad-data.version;
+
+buildEnv {
+  name = "zeroad-${zeroad-unwrapped.version}";
+  inherit (zeroad-unwrapped) meta;
+
+  buildInputs = [ makeWrapper ];
+
+  paths = [ zeroad-unwrapped zeroad-data ];
+
+  pathsToLink = [ "/" "/bin" ];
+
+  postBuild = ''
+    for i in $out/bin/*; do
+      wrapProgram "$i" \
+        --set ZEROAD_ROOTDIR "$out/share/0ad"
+    done
+  '';
+}
diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
index 80cc7763266..e74177a1ee3 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, python, gtk2 }:
+{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }:
 
 let version = "1.04.000"; in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6";
   };
 
-  buildInputs = [ pkgconfig python glib gtk2 ];
+  buildInputs = [ pkgconfig python glib gtk2 readline ];
 
   configureFlags = [ "--with-gtk" "--with--board3d" ];
 
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
new file mode 100644
index 00000000000..b30b4c4a2c1
--- /dev/null
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -0,0 +1,82 @@
+# Tested on linux-x86_64.  Might work on linux-i386.  Probably won't work on anything else.
+
+# To use this driver in NixOS, add it to printing.drivers in configuration.nix.
+# configuration.nix might look like this when you're done:
+# { pkgs, ... }: {
+#   printing = {
+#     enable = true;
+#     drivers = [ pkgs.samsung-unified-linux-driver_4_01_17 ];
+#   };
+#   (more stuff)
+# }
+# (This advice was tested on the 1st November 2016.)
+
+{ stdenv, fetchurl, cups, libusb }:
+
+# Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
+# to see what will break when upgrading. Consider a new versioned attribute.
+let
+  installationPath = if stdenv.system == "x86_64-linux" then "x86_64" else "i386";
+  appendPath = if stdenv.system == "x86_64-linux" then "64" else "";
+  libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
+in stdenv.mkDerivation rec {
+  name = "samsung-UnifiedLinuxDriver-${version}";
+  version = "4.01.17";
+
+  src = fetchurl {
+    url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
+    sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0";
+  };
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  installPhase = ''
+    cd Linux/${installationPath}
+    mkdir -p $out/lib/cups/{backend,filter}
+    install -Dm755 mfp $out/lib/cups/backend/
+    install -Dm755 pstosecps pstospl pstosplc rastertospl rastertosplc $out/lib/cups/filter/
+    install -Dm755 libscmssc.so $out/lib/
+
+    GLOBIGNORE=*.so
+    for exe in $out/lib/cups/**/*; do
+      echo "Patching $exe"
+      patchelf \
+        --set-rpath ${libPath} \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        $exe
+    done
+    unset GLOBIGNORE
+
+    install -v at_root/usr/lib${appendPath}/libmfp.so.1.0.1 $out/lib
+    cd $out/lib
+    ln -s -f libmfp.so.1.0.1 libmfp.so.1
+    ln -s -f libmfp.so.1 libmfp.so
+
+    for lib in $out/lib/*.so; do
+      echo "Patching $lib"
+      patchelf \
+        --set-rpath ${libPath} \
+        $lib
+    done
+
+    mkdir -p $out/share/cups/model/samsung
+    cd -
+    cd ../noarch/at_opt/share/ppd
+    for i in *.ppd; do
+      sed -i $i -e \
+        "s,pstosecps,$out/lib/cups/filter/pstosecps,g; \
+         s,pstospl,$out/lib/cups/filter/pstospl,g; \
+         s,rastertospl,$out/lib/cups/filter/rastertospl,g"
+    done;
+    cp -r ./* $out/share/cups/model/samsung
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Samsung's Linux printing drivers; includes binaries without source code";
+    homepage = http://www.samsung.com/;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ joko ];
+  };
+}
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index 5f870bf9217..8ef788df66f 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, cups, libusb, libxml2 }:
+{ stdenv, fetchurl, glibc, cups, libusb, ghostscript }:
 
 let
 
@@ -15,45 +15,33 @@ in stdenv.mkDerivation rec {
     url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
   };
 
-  nativeBuildInputs = [ patchelf ];
+  buildInputs = [
+    cups
+    libusb
+  ];
 
-  phases = [ "unpackPhase" "installPhase" ];
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
   installPhase = ''
-    my_patchelf() {
-      opts=(); while [[ "$1" != - ]]; do opts+=( "$1" ); shift; done; shift
-      for binary in "$@"; do
-        echo "Patching ELF file: $binary"
-	patchelf "''${opts[@]}" $binary
-        ldd $binary | grep "not found" && exit 1
-      done; true
-    }
 
-    my_patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath ${cups.out}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
-      - ${arch}/{pstosecps,rastertospl,smfpnetdiscovery}
+    mkdir -p $out/bin
+    cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin
 
     mkdir -p $out/etc/sane.d/dll.d/
     install -m644 noarch/etc/smfp.conf $out/etc/sane.d
-    echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner
+    echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf
 
     mkdir -p $out/lib
-    my_patchelf \
-      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
-      - ${arch}/libscmssc.so*
     install -m755 ${arch}/libscmssc.so* $out/lib
 
     mkdir -p $out/lib/cups/backend
-    install -m755 ${arch}/smfpnetdiscovery $out/lib/cups/backend
+    ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend
 
     mkdir -p $out/lib/cups/filter
-    install -m755 ${arch}/{pstosecps,rastertospl} $out/lib/cups/filter
+    ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter
+    ln -s $ghostscript/bin/gs $out/lib/cups/filter
 
     mkdir -p $out/lib/sane
-    my_patchelf \
-      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.lib.makeLibraryPath [ stdenv.glibc libusb libxml2 ] } \
-      - ${arch}/libsane-smfp.so*
     install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
     ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
     ln -s libsane-smfp.so.1     $out/lib/sane/libsane-smfp.so
@@ -66,16 +54,39 @@ in stdenv.mkDerivation rec {
       . noarch/package_utils
       . noarch/scanner-script.pkg
       fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules
+      chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules
     )
 
-    mkdir -p $out/share/ppd
-    gzip -9 noarch/share/ppd/*.ppd
-    cp -R noarch/share/ppd $out/share/ppd/suld
-
-    cp -R noarch/share/locale $out/share
+    mkdir -p $out/share
+    cp -R noarch/share/* $out/share
+    gzip -9 $out/share/ppd/*.ppd
     rm -r $out/share/locale/*/*/install.mo
+
+    mkdir -p $out/share/cups
+    cd $out/share/cups
+    ln -s ../ppd .
+    ln -s ppd model
   '';
 
+  preFixup = ''
+
+  for bin in $out/bin/*; do
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
+    patchelf --set-rpath "$out/lib:${cups.out}/lib" "$bin"
+  done
+
+  patchelf --set-rpath "$out/lib:${cups.out}/lib" "$out/lib/libscmssc.so"
+
+  ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+
+  '';
+
+  # all binaries are already stripped
+  dontStrip = true;
+
+  # we did this in prefixup already
+  dontPatchELF = true;
+
   meta = with stdenv.lib; {
     description = "Unified Linux Driver for Samsung printers and scanners";
     homepage = http://www.bchemnet.com/suldr;
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 40845a0988c..f3b12dc48f8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.20";
+    version = "1.9.22";
     url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2";
-    sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97";
+    sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.47";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl";
+    sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/unstable.nix
similarity index 86%
rename from pkgs/misc/jackaudio/git.nix
rename to pkgs/misc/jackaudio/unstable.nix
index ac50b4c3d39..1f8a41da32f 100644
--- a/pkgs/misc/jackaudio/git.nix
+++ b/pkgs/misc/jackaudio/unstable.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline
+, bash, libsamplerate, libsndfile, readline, eigen, celt
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
@@ -23,21 +23,21 @@ let
   optLibopus = shouldUsePkg libopus;
 in
 stdenv.mkDerivation rec {
-  name = "${prefix}jack2-${version}";
-  version = "2015-09-03";
+  name = "${prefix}jack2-unstable-${version}";
+  version = "2016-08-18";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
-    rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c";
-    sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1";
+    rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46";
+    sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
   buildInputs = [
     python
 
-    libsamplerate libsndfile readline
+    libsamplerate libsndfile readline eigen celt
 
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 5e94f6f7771..ffdaf3949ae 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -41,7 +41,7 @@
       # this is the example we will be using
       nixEnv = complicatedMyEnv {
         name = "nix";
-        buildInputs = [ libtool stdenv perl curl bzip2 openssl db45 autoconf automake zlib ];
+        buildInputs = [ libtool stdenv perl curl bzip2 openssl db5 autoconf automake zlib ];
       };
     };
   }
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix
new file mode 100644
index 00000000000..17450f36daa
--- /dev/null
+++ b/pkgs/os-specific/linux/devmem2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "devmem2-2004-08-05";
+
+  src = fetchurl {
+    url = "http://lartmaker.nl/lartware/port/devmem2.c";
+    sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c";
+  };
+
+  buildCommand = ''
+    export hardeningDisable=format  # fix compile error
+    cc "$src" -o devmem2
+    install -D devmem2 "$out/bin/devmem2"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple program to read/write from/to any location in memory";
+    homepage = "http://lartmaker.nl/lartware/port/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index bb86b41fd21..2930ebdfc7b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.28";
+  version = "4.4.30";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1z7ln5llv67n2y9k6ihy4l4zm03yabhma8xhc0psp4x8168wn6l4";
+    sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index 0a2da165638..b3a5e97e5d5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.5";
+  version = "4.8.6";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8";
+    sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 11f07f13345..6bba248374b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -87,8 +87,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.7.10";
-      grrev  = "201610262029";
-      sha256 = "0bczfyb0zazccl9d8sxm4p34nayamyiv7c1hp272glcjjmvlb7cv";
+      grrev  = "201611011946";
+      sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix
new file mode 100644
index 00000000000..f5f08a3e7c6
--- /dev/null
+++ b/pkgs/os-specific/linux/lksctp-tools/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "lksctp-tools-1.0.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lksctp/${name}.tar.gz";
+    sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs";
+  };
+
+  meta = {
+    description = "Linux Kernel Stream Control Transmission Protocol Tools.";
+    homepage = http://lksctp.sourceforge.net/;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 56f14b30acd..6b1e93e59df 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Grawp";
     repo = "rtl8812au_rtl8821au";
-    rev = "9c5b2978ab079081dd1e981353be681a1cf495de";
-    sha256 = "0bx1vgs2qldwwhdgklbqz2vy9x4jg7cj3d6w6cpkndkcr7h0m5vz";
+    rev = "d716b38abf5ca7da72d2be0adfcebe98cceeda8f";
+    sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry";
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index bcba8ef21c6..5a1c473a43d 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "5.10.7";
+  version = "6.0.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "1zzkaps78nqjgriz6i6m7bdnm5srvslq27lr3vk6cizn2xz9nc1b";
+    sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index d37463f81a5..d2b3cc1c419 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.2.3";
+  version = "7.2.4";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0237f1x2ir3g6ll0w7fpm6vnccqlx1xr015q37qh693hykyi1hy9";
+    sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 810fabb253f..8cb96d445c8 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
 , libseccomp ? null }:
 
-let version = "9.10.4-P3"; in
+let version = "9.10.4-P4"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1vxs29w4hnl7jcd7sknga58xv1qk2rcpsxyich7cpp7xi77faxd0";
+    sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754";
   };
 
   outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 5a566973787..3813baa6420 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.8300";
+  version = "3.0.8500";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8";
+    sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc";
   };
 
   buildInputs = with pkgs; [
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 72b12d5aad5..166c5cdbf52 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  name = "memcached-1.4.20";
+  name = "memcached-1.4.33";
 
   src = fetchurl {
     url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "0620llasj8xgffk6hk2ml15z0c5i34455wwg60i1a2zdir023l95";
+    sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3";
   };
 
   buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 8587134ad39..babca9af168 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "6.0.9";
+  version = "6.1.0";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1n7kf25yimgy9wy04hv5qvp4rzdzdr0ar92lhwms812qkhp3i4mq";
+    sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb";
   };
 
   buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 911819f48aa..09821b01700 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.7";
+  version = "1.0.8";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0";
+    sha256 = "1fdfi0yzzdrrlml6780n4fh61sqm7pw6fcd1y67kfkvw8hy5c0k9";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 048321ea2e5..ef7299966a7 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "obnam-${version}";
-  version = "1.19.1";
+  version = "1.20.2";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";
+    sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index d0d9fa02178..518edbb3ea4 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,31 +1,34 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl
-, pkgconfig, rlog }:
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig, perl
+, gettext, fuse, openssl, tinyxml2
+}:
 
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
-    sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb";
+    sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
   };
 
-  buildInputs = [ boost fuse openssl rlog ];
-  nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
+  buildInputs = [ gettext fuse openssl tinyxml2 ];
+  nativeBuildInputs = [ cmake pkgconfig perl ];
 
-  configureFlags = [
-    "--with-boost-serialization=boost_wserialization"
-    "--with-boost-filesystem=boost_filesystem"
-  ];
+  cmakeFlags =
+    [ "-DUSE_INTERNAL_TINYXML=OFF"
+      "-DBUILD_SHARED_LIBS=ON"
+      "-DINSTALL_LIBENCFS=ON"
+    ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    description = "An encrypted filesystem in user-space via FUSE";
     homepage = https://vgough.github.io/encfs;
-    description = "Provides an encrypted filesystem in user-space via FUSE";
-    license = licenses.lgpl2;
+    license = with licenses; [ gpl3 lgpl3 ];
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 577c0a33b3e..0bdcfa76fec 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl,
-  boost, clasp, cmake, gringo, re2c
+  boost, clasp, cmake, clingo, re2c
 }:
 
 let
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
   };
 
-  buildInputs = [ boost clasp cmake gringo re2c ];
+  buildInputs = [ boost clasp cmake clingo re2c ];
 
   buildPhase = ''
     cmake -DCMAKE_BUILD_TYPE=Release \
-      -DGRINGO_LOC=${gringo}/bin/gringo \
+      -DGRINGO_LOC=${clingo}/bin/gringo \
       -DCLASP_LOC=${clasp}/bin/clasp \
       -DENCODING_LOC=$out/share/aspcud/specification.lp \
       .
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 05c3d6a7819..e61f99d2bbf 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.148";
+  version = "1.152";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "1d0qqzln5w7f7kkw75cp8g8hg43f85xj0h68y6j6yw7d62q1406g";
+    sha256 = "1hk5g0zhj78p74z0hdx3v29s5bpx0npabwdawaigwwxrrj03q9mw";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix
new file mode 100644
index 00000000000..6ab0a68920f
--- /dev/null
+++ b/pkgs/tools/misc/clingo/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub,
+  bison, re2c, scons
+}:
+
+let
+  version = "5.1.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "clingo-${version}";
+
+  src = fetchFromGitHub {
+    owner = "potassco";
+    repo = "clingo";
+    rev = "v${version}";
+    sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv";
+  };
+
+  buildInputs = [ bison re2c scons ];
+
+  buildPhase = ''
+    scons --build-dir=release
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A grounder and solver for logic programs.";
+    homepage = http://potassco.org;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.hakuch ];
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
deleted file mode 100644
index ae71c01314c..00000000000
--- a/pkgs/tools/misc/gringo/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl,
-  bison, re2c, scons
-}:
-
-let
-  version = "4.5.4";
-in
-
-stdenv.mkDerivation rec {
-  name = "gringo-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
-    sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
-  };
-
-  buildInputs = [ bison re2c scons ];
-
-  patches = [
-    ./gringo-4.5.4-cmath.patch
-  ];
-
-  buildPhase = ''
-    scons --build-dir=release
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp build/release/gringo $out/bin/gringo
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Converts input programs with first-order variables to equivalent ground programs";
-    homepage = http://potassco.sourceforge.net/;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.hakuch ];
-    license = licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
deleted file mode 100644
index 7b5510e2344..00000000000
--- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gringo/libgringo/src/term.cc~	2016-07-12 23:56:10.593577749 -0400
-+++ gringo/libgringo/src/term.cc	2016-07-12 23:52:35.169968338 -0400
-@@ -22,6 +22,8 @@
- #include "gringo/logger.hh"
- #include "gringo/graph.hh"
- 
-+#include <cmath>
-+
- namespace Gringo {
- 
- // {{{ definition of Defines
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index a6891886664..c138261f9a3 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
-, findutils, xdpyinfo, xprop, gnugrep, ncurses
+, bc, findutils, xdpyinfo, xprop, gnugrep, ncurses
 }:
 
 stdenv.mkDerivation {
@@ -30,7 +30,8 @@ stdenv.mkDerivation {
       --prefix PATH : "${xdpyinfo}/bin" \
       --prefix PATH : "${xprop}/bin" \
       --prefix PATH : "${gnugrep}/bin" \
-      --prefix PATH : "${ncurses}/bin"
+      --prefix PATH : "${ncurses}/bin" \
+      --prefix PATH : "${bc}/bin"
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3710eef238f..8f1ac7546bb 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.31";
+  version = "2016.11.02";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4";
+    sha256 = "97777924c3df763d3f2259c9a7f227a01e787ccd452be198191a4a848a7632d7";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 32cf5750c6a..1c91235652a 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, nodejs, which, python27, utillinux }:
 
-let version = "17.3"; in
+let version = "18"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
   src = fetchurl {
     url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
-    sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri";
+    sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap";
   };
 
   buildInputs = [ which python27 nodejs ] ++
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 958bea34e7d..56c0d26a999 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.50.3";
+  name = "curl-7.51.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv";
+    sha256 = "1pldg1d8606p4q83k8fcp61kfcsbphln22mycw7h7r87i42410kz";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat-gnu/default.nix
similarity index 100%
rename from pkgs/tools/networking/netcat/default.nix
rename to pkgs/tools/networking/netcat-gnu/default.nix
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index e71abcd8a2c..9933b512006 100644
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ b/pkgs/tools/networking/netcat-openbsd/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm0755 nc $out/bin/nc
+    install -Dm0644 nc.1 $out/share/man/man1/nc.1
   '';
 
   meta = {
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
new file mode 100644
index 00000000000..d9b44cc2311
--- /dev/null
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "pixiewps-${version}";
+  version = "1.2.2";
+  src = fetchFromGitHub {
+    owner = "wiire";
+    repo = "pixiewps";
+    rev = "v${version}";
+    sha256 = "09znnj7p8cks7zxzklkdm4zy2qnp92vhngm9r0zfgawnl2b4r2aw";
+  };
+
+  preBuild = ''
+    cd src
+    substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"
+    substituteInPlace Makefile --replace "/local" ""
+  '';
+  
+  meta = {
+    description = "An offline WPS bruteforce utility";
+    homepage = https://github.com/wiire/pixiewps;
+    license = stdenv.lib.licenses.gpl3;
+    maintainer = stdenv.lib.maintainers.nico202;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix
new file mode 100644
index 00000000000..59d2b04786d
--- /dev/null
+++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps }:
+
+stdenv.mkDerivation rec {
+  version = "1.5.2";
+  name = "reaver-wps-t6x-${version}";
+
+  src = fetchFromGitHub {
+    owner = "t6x";
+    repo = "reaver-wps-fork-t6x";
+    rev = "v${version}";
+    sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b";
+  };
+
+  buildInputs = [ libpcap sqlite pixiewps ];
+
+  prePatch = "cd src";
+
+  preInstall = "mkdir -p $out/bin";
+
+  meta = {
+    description = "Online and offline brute force attack against WPS";
+    homepage = https://github.com/t6x/reaver-wps-fork-t6x;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainer = stdenv.lib.maintainers.nico202;
+  };
+}
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 64c12dc6e5e..165091d934a 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A script to make rofi work with password-store";
     homepage = https://github.com/carnager/rofi-pass;
-    maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     license = stdenv.lib.licenses.gpl3;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 13c50fe3ec9..46932076177 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -13,11 +13,22 @@ stdenv.mkDerivation rec{
 
   buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];
 
-  preConfigure = ''
-    export ZLIB_CFLAGS=" "
-    export ZLIB_LIBS="-lz"
-    export UUID_CFLAGS=" "
-    export UUID_LIBS="-luuid"
+  # Allow UI to load when running as non-root
+  patches = [ ./web_access.patch ];
+
+  # Build will fail trying to create /var/{cache,lib,log}/netdata without this
+  postPatch = ''
+   sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+  ];
+
+  # App fails on runtime if the default config file is not detected
+  # The upstream installer does prepare an empty file too
+  postInstall = ''
+    touch $out/etc/netdata/netdata.conf
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch
new file mode 100644
index 00000000000..f1e4bd64cbb
--- /dev/null
+++ b/pkgs/tools/system/netdata/web_access.patch
@@ -0,0 +1,20 @@
+--- a/src/web_client.c.orig
++++ b/src/web_client.c
+@@ -331,7 +331,7 @@
+         buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename);
+         return 404;
+     }
+-
++#if 0
+     // check if the file is owned by expected user
+     if(stat.st_uid != web_files_uid()) {
+         error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
+@@ -345,7 +345,7 @@
+         buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
+         return 403;
+     }
+-
++#endif
+     if((stat.st_mode & S_IFMT) == S_IFDIR) {
+         snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename);
+         return mysendfile(w, webfilename);
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index e2fa8eacc91..e0f30b2db73 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sg3_utils-1.31";
+  name = "sg3_utils-1.42";
 
   src = fetchurl {
     url = "http://sg.danny.cz/sg/p/${name}.tgz";
-    sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq";
+    sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx";
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05195015670..8b6be885ee5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6,6 +6,7 @@
  * Hint: ### starts category names.
  */
 { system, bootStdenv, noSysDirs, config, crossSystem, platform, lib
+, nixpkgsFun
 , ... }:
 self: pkgs:
 
@@ -35,10 +36,9 @@ in
   newScope = extra: lib.callPackageWith (defaultScope // extra);
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
-  forceSystem = system: kernel: (import ../..) {
+  forceSystem = system: kernel: nixpkgsFun {
     inherit system;
     platform = platform // { kernelArch = kernel; };
-    inherit bootStdenv noSysDirs config crossSystem;
   };
 
   # Used by wine, firefox with debugging version of Flash, ...
@@ -771,6 +771,8 @@ in
 
   deisctl = callPackage ../development/tools/deisctl {};
 
+  devmem2 = callPackage ../os-specific/linux/devmem2 { };
+
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
@@ -864,7 +866,7 @@ in
 
   goa = callPackage ../development/tools/goa { };
 
-  gringo = callPackage ../tools/misc/gringo { };
+  clingo = callPackage ../tools/misc/clingo { };
 
   gti = callPackage ../tools/misc/gti { };
 
@@ -1263,9 +1265,10 @@ in
     cudatoolkit6
     cudatoolkit65
     cudatoolkit7
-    cudatoolkit75;
+    cudatoolkit75
+    cudatoolkit8;
 
-  cudatoolkit = cudatoolkit7;
+  cudatoolkit = cudatoolkit8;
 
   cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {};
 
@@ -1517,7 +1520,9 @@ in
 
   enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
 
-  encfs = callPackage ../tools/filesystems/encfs { };
+  encfs = callPackage ../tools/filesystems/encfs {
+    tinyxml2 = tinyxml-2;
+  };
 
   enscript = callPackage ../tools/text/enscript { };
 
@@ -2327,6 +2332,8 @@ in
     ffmpeg = ffmpeg_2;
   };
 
+  lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
+
   lnav = callPackage ../tools/misc/lnav { };
 
   loc = callPackage ../development/misc/loc { };
@@ -2421,15 +2428,36 @@ in
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
+  nodejs = nodejs-6_x;
+
+  nodejs-slim = nodejs-slim-6_x;
+
   nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
     libtool = darwin.cctools;
   };
 
+  nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix {
+    libtool = darwin.cctools;
+    enableNpm = false;
+  };
+
   nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {
     libtool = darwin.cctools;
   };
 
-  nodejs = nodejs-4_x;
+  nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix {
+    libtool = darwin.cctools;
+    enableNpm = false;
+  };
+
+  nodejs-7_x = callPackage ../development/web/nodejs/v7.nix {                                                                                                 
+    libtool = darwin.cctools;                                                                                                                                 
+  };                                                                                                                                                          
+                                                                                                                                                              
+  nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix {                                                                                            
+    libtool = darwin.cctools;                                                                                                                                 
+    enableNpm = false;                                                                                                                                        
+  };
 
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
     nodejs = pkgs.nodejs-6_x;
@@ -2439,7 +2467,7 @@ in
     nodejs = pkgs.nodejs-4_x;
   };
 
-  nodePackages = nodePackages_4_x;
+  nodePackages = nodePackages_6_x;
 
   # Can be used as a user shell
   nologin = shadow;
@@ -2799,7 +2827,9 @@ in
 
   netboot = callPackage ../tools/networking/netboot {};
 
-  netcat = callPackage ../tools/networking/netcat { };
+  netcat = netcat-openbsd;
+
+  netcat-gnu = callPackage ../tools/networking/netcat-gnu { };
 
   netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
 
@@ -3195,6 +3225,8 @@ in
 
   pius = callPackage ../tools/security/pius { };
 
+  pixiewps = callPackage ../tools/networking/pixiewps {};
+
   pk2cmd = callPackage ../tools/misc/pk2cmd { };
 
   plantuml = callPackage ../tools/misc/plantuml { };
@@ -3388,6 +3420,8 @@ in
   rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};
+  
+  reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {};
 
   recordmydesktop = callPackage ../applications/video/recordmydesktop { };
 
@@ -4237,9 +4271,7 @@ in
     # load into the Ben Nanonote
     gccCross =
       let
-        pkgsCross = (import ../..) {
-          inherit system;
-          inherit bootStdenv noSysDirs config;
+        pkgsCross = nixpkgsFun {
           # Ben Nanonote system
           crossSystem = {
             config = "mipsel-unknown-linux";
@@ -4817,6 +4849,8 @@ in
     postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
   });
 
+  all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
+
   inherit (ocamlPackages) haxe;
 
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
@@ -5509,7 +5543,6 @@ in
   pythonFull = python.override{x11Support=true;};
   python2Full = python2.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
-  python27Full = python2Full;
 
   # pythonPackages further below, but assigned here because they need to be in sync
   pythonPackages = python2Packages;
@@ -5517,7 +5550,7 @@ in
   python3Packages = python35Packages;
 
   python26 = callPackage ../development/interpreters/python/cpython/2.6 {
-    db = db47;
+    db = db4;
     self = python26;
   };
   python27 = callPackage ../development/interpreters/python/cpython/2.7 {
@@ -6498,7 +6531,7 @@ in
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
-    db = if stdenv.isFreeBSD then db47 else db;
+    db = if stdenv.isFreeBSD then db4 else db;
     # XXX: only the db_185 interface was available through
     #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
@@ -6712,9 +6745,6 @@ in
   # bsd-like license
   db = db5;
   db4 = db48;
-  db44 = callPackage ../development/libraries/db/db-4.4.nix { };
-  db45 = callPackage ../development/libraries/db/db-4.5.nix { };
-  db47 = callPackage ../development/libraries/db/db-4.7.nix { };
   db48 = callPackage ../development/libraries/db/db-4.8.nix { };
   db5 = db53;
   db53 = callPackage ../development/libraries/db/db-5.3.nix { };
@@ -7073,7 +7103,7 @@ in
 
   #GMP ex-satellite, so better keep it near gmp
   mpfr = callPackage ../development/libraries/mpfr/default.nix { };
-  
+
   mpfi = callPackage ../development/libraries/mpfi { };
 
   # A GMP fork
@@ -8697,7 +8727,7 @@ in
   };
 
   opensubdiv = callPackage ../development/libraries/opensubdiv {
-    cudatoolkit = cudatoolkit75;
+    cudatoolkit = cudatoolkit8;
   };
 
   openwsman = callPackage ../development/libraries/openwsman {};
@@ -12164,7 +12194,7 @@ in
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {
-    cudatoolkit = cudatoolkit75;
+    cudatoolkit = cudatoolkit8;
     python = python35;
   };
 
@@ -12734,6 +12764,8 @@ in
 
   evopedia = callPackage ../applications/misc/evopedia { };
 
+  exercism = callPackage ../applications/misc/exercism { };
+
   gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
 
   keepassx = callPackage ../applications/misc/keepassx { };
@@ -12771,6 +12803,8 @@ in
 
   fmit = qt5.callPackage ../applications/audio/fmit { };
 
+  fmsynth = callPackage ../applications/audio/fmsynth { };
+
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
   font-manager = callPackage ../applications/misc/font-manager { };
@@ -15969,7 +16003,9 @@ in
 
   keen4 = callPackage ../games/keen4 { };
 
-  zeroad = callPackage ../games/0ad { };
+  zeroadPackages = callPackage ../games/0ad { };
+
+  zeroad = zeroadPackages.zeroad;
 
   ### DESKTOP ENVIRONMENTS
 
@@ -16453,13 +16489,27 @@ in
 
   aspino = callPackage ../applications/science/logic/aspino {};
 
-  inherit (ocaml-ng.ocamlPackages_4_01_0) coq;
+  coq = callPackage ../applications/science/logic/coq {
+    inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
+  };
 
-  inherit (ocamlPackages) coq_HEAD;
+  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
 
-  inherit (ocamlPackages) coq_8_5;
+  coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
 
-  inherit (ocaml-ng.ocamlPackages_3_12_1) coq_8_3;
+  coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
+    make = pkgs.gnumake3;
+    inherit (ocamlPackages_3_12_1) ocaml findlib;
+    camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
+    lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
+  };
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
 
@@ -16484,6 +16534,7 @@ in
     domains = callPackage ../development/coq-modules/domains {};
 
     fiat = callPackage ../development/coq-modules/fiat {};
+    fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
 
     flocq = callPackage ../development/coq-modules/flocq {};
 
@@ -16527,6 +16578,8 @@ in
 
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
 
+    fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
+
   };
 
   coqPackages = mkCoqPackages_8_4 coqPackages;
@@ -16987,7 +17040,7 @@ in
     libopus = libopus.override { withCustomModes = true; };
   };
   libjack2 = jack2Full.override { prefix = "lib"; };
-  libjack2-git = callPackage ../misc/jackaudio/git.nix { };
+  libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
 
   keynav = callPackage ../tools/X11/keynav { };
 
@@ -17162,6 +17215,7 @@ in
   mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { };
 
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
+  samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
   samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index c54b23853c5..7d370bec6b5 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -24,13 +24,12 @@
 
 , crossSystem ? null
 , platform ? null
-}:
+} @ args:
 
 
 let configExpr = config; platform_ = platform; in # rename the function arguments
 
 let
-
   lib = import ../../lib;
 
   # Allow both:
@@ -58,9 +57,20 @@ let
     else config.platform or platformAuto;
 
   topLevelArguments = {
-    inherit system bootStdenv noSysDirs config crossSystem platform lib;
+    inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun;
   };
 
+  # A few packages make a new package set to draw their dependencies from.
+  # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
+  # give `all-packages.nix` all the arguments to this function, even ones that
+  # don't concern it, we give it this function to "re-call" nixpkgs, inheriting
+  # whatever arguments it doesn't explicitly provide. This way,
+  # `all-packages.nix` doesn't know more than it needs too.
+  #
+  # It's OK that `args` doesn't include the defaults: they'll be
+  # deterministically inferred the same way.
+  nixpkgsFun = newArgs: import ./. (args // newArgs);
+
   stdenvAdapters = self: super:
     let res = import ../stdenv/adapters.nix self; in res // {
       stdenvAdapters = res;
@@ -71,7 +81,7 @@ let
       inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
     });
 
-  stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
+  stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs;
 
   allPackages = self: super:
     let res = import ./all-packages.nix topLevelArguments res self;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e1079f354d1..f305c55dbfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,6 +58,9 @@ rec {
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
       bootPkgs = packages.ghc7103;
     };
+    ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix {
+      bootPkgs = packages.ghc801;
+    };
 
     jhc = callPackage ../development/compilers/jhc {
       inherit (packages.ghc763) ghcWithPackages;
@@ -126,6 +129,10 @@ rec {
       ghc = compiler.ghcjs;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcjsHEAD = callPackage ../development/haskell-modules {
+      ghc = compiler.ghcjsHEAD;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
 
     # These attributes exist only for backwards-compatibility so that we don't break
     # stack's --nix support. These attributes will disappear in the foreseeable
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 58e9512e31c..d2c41d89a62 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -340,6 +340,8 @@ let
     piqi = callPackage ../development/ocaml-modules/piqi { };
     piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
 
+    ptime = callPackage ../development/ocaml-modules/ptime { };
+
     re2_p4 = callPackage ../development/ocaml-modules/re2 { };
 
     result = callPackage ../development/ocaml-modules/ocaml-result { };
@@ -429,6 +431,8 @@ let
 
     safepass = callPackage ../development/ocaml-modules/safepass { };
 
+    sedlex = callPackage ../development/ocaml-modules/sedlex { };
+
     sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
@@ -612,7 +616,7 @@ let
       then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
       else {}
     ) // {
-      coq = coq_8_5;
+      coq = pkgs.coq_8_5;
     });
 
     haxe = callPackage ../development/compilers/haxe { };
@@ -654,24 +658,6 @@ let
       enableX11 = config.unison.enableX11 or true;
     };
 
-    coq = callPackage ../applications/science/logic/coq {
-      camlp5 = camlp5_transitional;
-    };
-
-    coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
-      camlp5 = camlp5_transitional;
-    };
-
-    coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
-      camlp5 = camlp5_transitional;
-    };
-
-    coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
-      make = pkgs.gnumake3;
-      camlp5 = camlp5_transitional;
-      lablgtk = lablgtk_2_14;
-    };
-
     hol_light = callPackage ../applications/science/logic/hol_light {
       camlp5 = camlp5_strict;
     };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5824b2e05a..2c4e70c7cd1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -394,14 +394,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ArchiveCpio = buildPerlPackage {
-    name = "Archive-Cpio-0.09";
+  ArchiveCpio = buildPerlPackage rec {
+    name = "Archive-Cpio-0.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.09.tar.gz;
-      sha256 = "1cf8k5zjykdbc1mn8lixlkij6jklwn6divzyq2grycj3rpd36g5c";
+      url = "mirror://cpan/authors/id/P/PI/PIXEL/${name}.tar.gz";
+      sha256 = "246fb31669764e78336b2191134122e07c44f2d82dc4f37d552ab28f8668bed3";
     };
     meta = {
       description = "Module for manipulations of cpio archives";
+      # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
   };
@@ -6453,10 +6455,10 @@ let self = _self // overrides; _self = with self; {
   if_ = self."if";
 
   ImageInfo = buildPerlPackage rec {
-    name = "Image-Info-1.38";
+    name = "Image-Info-1.39";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz";
-      sha256 = "b8a68b5661555feaf767956fe9ff14c917a63bedb3e30454d5598d992eb7e919";
+      sha256 = "af155264667a2c22e3e2225195b8f6589329f9567e1789b7ce439ee21178713d";
     };
     propagatedBuildInputs = [ IOstringy ];
     meta = {
@@ -8471,10 +8473,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Moo = buildPerlPackage rec {
-    name = "Moo-2.002003";
+    name = "Moo-2.002005";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "a18f287d7ddda1e9862bc31c44394f42db077e2d9b93ca71785ccfacbc2f2bcd";
+      sha256 = "8147f98a43f7beb808773202b05d3fba25d5fca018ad939d7e529f4d36d6dc68";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ];
@@ -10971,10 +10973,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleTiny = buildPerlPackage rec {
-    name = "Role-Tiny-2.000003";
+    name = "Role-Tiny-2.000005";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "6e6c967e1154f290a40c9c60a762cc3b2ec5438107a4fbadddbe55a55b393434";
+      sha256 = "593a29b621e029bf0218d0154d5dfdf6ec502afc49adeeadae6afd0c70063115";
     };
     meta = {
       description = "Roles. Like a nouvelle cuisine portion size slice of Moose";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 185043b27e3..1c6acd3ddd9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -364,6 +364,48 @@ in {
     };
   };
 
+  altair = buildPythonPackage rec {
+    name = "altair-1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/altair/${name}.tar.gz";
+      sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r";
+    };
+
+    propagatedBuildInputs = with self; [ vega pandas ipython traitlets ];
+
+    meta = {
+      description = "A declarative statistical visualization library for Python.";
+      homepage = https://github.com/altair-viz/altair;
+      license = licenses.bsd3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ teh ];
+    };
+  };
+  vega = buildPythonPackage rec {
+    name = "vega-0.4.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/v/vega/${name}.tar.gz";
+      sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+    };
+
+    propagatedBuildInputs = with self; [ jupyter_core pandas ];
+
+    meta = {
+      description = " An IPython/Jupyter widget for Vega and Vega-Lite.";
+      longDescription = ''
+        To use this you have to enter a nix-shell with vega. Then run:
+
+        jupyter nbextension install --user --py vega
+        jupyter nbextension enable --user vega
+      '';
+      homepage = https://github.com/vega/ipyvega;
+      license = licenses.bsd3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ teh ];
+    };
+  };
   acme_0_5_0 = buildPythonPackage rec {
     version = "0.5.0";
     name = "acme-${version}";
@@ -885,13 +927,13 @@ in {
   };
 
   ansible2 = buildPythonPackage rec {
-    version = "2.1.2.0";
+    version = "2.2.0.0";
     name = "ansible-${version}";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-      sha256 = "1sr12ryn2dc28009bkfl6f8rp94ychbr9i7wlf6an1bw76ysfdww";
+      sha256 = "11l5814inr44ammp0sh304rqx2382fr629c0pbwf0k1rjg99iwfr";
     };
 
     prePatch = ''
@@ -2199,7 +2241,7 @@ in {
       description = "A decorator for caching properties in classes";
       homepage = https://github.com/pydanny/cached-property;
       license = licenses.bsd3;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ ericsagnes ];
     };
   };
@@ -2630,13 +2672,15 @@ in {
 
   bitbucket_api = buildPythonPackage rec {
     name = "bitbucket-api-0.4.4";
+    # python3 does not support relative imports
+    disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz";
       sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2";
     };
 
-    propagatedBuildInputs = with self; [ requests_oauth2 nose sh ];
+    propagatedBuildInputs = with self; [ requests_oauthlib nose sh ];
 
     doCheck = false;
 
@@ -5334,6 +5378,23 @@ in {
     };
   };
 
+  datrie = buildPythonPackage rec {
+    name = "datrie";
+    version = "0.7.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz";
+      sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
+    };
+    meta = {
+      description = "Super-fast, efficiently stored Trie for Python";
+      homepage = "https://github.com/kmike/datrie";
+      license = licenses.lgpl2;
+      maintainers = with maintainers; [ lewo ];
+    };
+  };
+
+
   distributed = buildPythonPackage rec {
 
     name = "distributed-${version}";
@@ -9612,12 +9673,12 @@ in {
 
   django_1_10 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.10.2";
+    version = "1.10.3";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-      sha256 = "1qdwgkwlq5wl0wn247d9gid49xpz4qggk0lcdqxq8d7v1cmg29z1";
+      sha256 = "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg";
     };
 
     patches = [
@@ -9644,12 +9705,12 @@ in {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9.10";
+    version = "1.9.11";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "007w2pshbk1s6gfgp8717fwz01l8mcmd2lkxdgqqgd11bag7qfjv";
+      sha256 = "17bxmfp92bdwjachjqb5zdlay5fhv4125hc85ln4ggyz0f5zvp6s";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -9668,12 +9729,12 @@ in {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.15";
+    version = "1.8.16";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1kga849ixd6sz6svhv8dysyjr03wphqgl4wjw2yczmc5r4x58gl6";
+      sha256 = "1pc1j3q64v65c573xwx64apjnf2v19nzxsidjiyp02c6l8bsyji2";
     };
 
     # too complicated to setup
@@ -9719,6 +9780,9 @@ in {
     name = "Django-${version}";
     version = "1.6.11";
 
+    # Support to python-3.4 and higher was introduced in django_1_7
+    disabled = !(isPy26 || isPy27 || isPy33);
+
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz";
       sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y";
@@ -10706,6 +10770,9 @@ in {
 
     buildInputs = [ self.django ];
 
+    # There is no test embedded
+    doCheck = false;
+
     meta = {
       description = "A snapshot of django-filebrowser for the Mezzanine CMS";
       longDescription = ''
@@ -11813,6 +11880,28 @@ in {
     };
   };
 
+  github-webhook = buildPythonPackage rec {
+    name = "github-webhook-${version}";
+    version = "unstable-2016-03-11";
+
+    # There is a PyPI package but an older one.
+    src = pkgs.fetchgit {
+      url = "https://github.com/bloomberg/python-github-webhook.git";
+      rev = "ca1855479ee59c4373da5425dbdce08567605d49";
+      sha256 = "0mqwig9281iyzbphp1d21a4pqdrf98vs9k8lqpqx6spzgqaczx5f";
+    };
+
+    propagatedBuildInputs = with self; [ flask ];
+    # No tests
+    doCheck = false;
+
+    meta = {
+      description = "A framework for writing webhooks for GitHub";
+      license = licenses.mit;
+      homepage = https://github.com/bloomberg/python-github-webhook;
+    };
+  };
+
   goobook = buildPythonPackage rec {
     name = "goobook-1.9";
     disabled = isPy3k;
@@ -13961,6 +14050,7 @@ in {
       url = "https://github.com/stephenmcd/mezzanine/archive/${version}.tar.gz";
       sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi";
     };
+    patches = [ ../development/python-modules/mezzanine/writable_settings.patch ];
 
     disabled = isPyPy;
 
@@ -17479,21 +17569,18 @@ in {
     };
   };
 
-  pandas = self.pandas_18;
-
-  pandas_18 = let
+  pandas = let
     inherit (pkgs.stdenv.lib) optional optionalString;
     inherit (pkgs.stdenv) isDarwin;
   in buildPythonPackage rec {
     name = "pandas-${version}";
-    version = "0.19.0";
+    version = "0.19.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pandas/${name}.tar.gz";
-      sha256 = "4697606cdf023c6b7fcb74e48aaf25cf282a1a00e339d2d274cf1b663748805b";
+      sha256 = "2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421";
     };
 
-
     LC_ALL = "en_US.UTF-8";
     buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx;
     propagatedBuildInputs = with self; [
@@ -17692,11 +17779,11 @@ in {
 
   partd = buildPythonPackage rec {
     name = "partd-${version}";
-    version = "0.3.3";
+    version = "0.3.6";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/partd/${name}.tar.gz";
-      sha256 = "0fgrkfhgpm0hf5gs6wvgv7p9ls2kvgk0mc5hkmjw5slfbkn3fz8v";
+      sha256 = "1wl8kifdljnpbz0ls7mbbc9j23fc5xzm639im7h88spyg02w68hm";
     };
 
     buildInputs = with self; [ pytest ];
@@ -17704,6 +17791,7 @@ in {
     propagatedBuildInputs = with self; [ locket numpy pandas pyzmq toolz ];
 
     checkPhase = ''
+      rm partd/tests/test_zmq.py # requires network & fails
       py.test
     '';
 
@@ -21714,13 +21802,17 @@ in {
 
   requests_oauth2 = buildPythonPackage rec {
     name = "requests-oauth2-0.1.1";
+    # python3 does not support relative imports
+    disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz;
       sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg";
     };
 
-    propagatedBuildInputs = with self; [ requests_oauthlib ];
+    propagatedBuildInputs = with self; [ requests2 ];
+    # no tests in tarball
+    doCheck = false;
 
     meta = {
       description = "Python's Requests OAuth2 (Open Authentication) plugin";
@@ -28186,26 +28278,6 @@ in {
   };
 
 
-  moreItertools = buildPythonPackage rec {
-    name = "more-itertools-2.2";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz";
-      sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478";
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-
-    meta = {
-      homepage = https://more-itertools.readthedocs.org;
-      description = "Expansion of the itertools module";
-      license = licenses.mit;
-    };
-  };
-
-
   uncertainties = buildPythonPackage rec {
     name = "uncertainties-${version}";
     version = "3.0.1";
@@ -30005,7 +30077,7 @@ in {
 	ndg-httpsclient
 	dateutil
 	inflection
-	moreItertools
+	more-itertools
 	requests2
 	pandas
      ];
@@ -30621,6 +30693,8 @@ in {
     };
   };
 
+  moreItertools = self.more-itertools;
+
   more-itertools = buildPythonPackage rec {
     name = "more-itertools-${version}";
     version = "2.2";
@@ -30630,19 +30704,25 @@ in {
       sha256 = "1q3wqsg44z01g7i5z6j1wc0nf5c5h8g77xny6fia2gddqw2jxrlk";
     };
 
-    doCheck = false;
+    propagatedBuildInputs = with self; [ nose ];
+
+    meta = {
+      homepage = https://more-itertools.readthedocs.org;
+      description = "Expansion of the itertools module";
+      license = licenses.mit;
+    };
   };
 
   jaraco_functools = buildPythonPackage rec {
     name = "jaraco.functools-${version}";
-    version = "1.11";
+    version = "1.15.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jaraco.functools/${name}.tar.gz";
-      sha256 = "08n7vxdbsl0637b1ap2x3rg698d2as0wzvvpx05dzkrdgsgxrx3g";
+      sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya";
     };
 
-    propagatedBuildInputs = with self; [ backports_functools_lru_cache ];
+    propagatedBuildInputs = with self; [ more-itertools backports_functools_lru_cache ];
 
     doCheck = false;
 
diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix
index 9b8cf5a0309..c36b0fed091 100644
--- a/pkgs/top-level/stdenv.nix
+++ b/pkgs/top-level/stdenv.nix
@@ -1,12 +1,11 @@
-{ system, bootStdenv, crossSystem, config, platform, lib, ... }:
-self: super:
-
-with super;
+{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, ... }:
+pkgs:
 
 rec {
   allStdenvs = import ../stdenv {
     inherit system platform config lib;
-    allPackages = args: import ../.. ({ inherit config system; } // args);
+    # TODO(@Ericson2314): hack for cross-compiling until I clean that in follow-up PR
+    allPackages = args: nixpkgsFun (args // { crossSystem = null; });
   };
 
   defaultStdenv = allStdenvs.stdenv // { inherit platform; };
@@ -14,14 +13,14 @@ rec {
   stdenv =
     if bootStdenv != null then (bootStdenv // {inherit platform;}) else
       if crossSystem != null then
-        stdenvCross
+        pkgs.stdenvCross
       else
         let
             changer = config.replaceStdenv or null;
         in if changer != null then
           changer {
             # We import again all-packages to avoid recursivities.
-            pkgs = import ../.. {
+            pkgs = nixpkgsFun {
               # We remove packageOverrides to avoid recursivities
               config = removeAttrs config [ "replaceStdenv" ];
             };